Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b3f28b2e authored by Colin Cross's avatar Colin Cross Committed by Gerrit Code Review
Browse files

Merge changes from topic "musl_arm64" 

* changes:
  Disable sanitizers that use runtimes for linux_musl arm64
  Separate host and host cross fuzz packaging
parents fcb86824 390fc746

cc/fuzz.go

+3 −1
Original line number Diff line number Diff line
@@ -398,7 +398,9 @@ func (s *ccRustFuzzPackager) GenerateBuildActions(ctx android.SingletonContext) 
		}



		hostOrTargetString := "target"

		if ccModule.Host() {

		if ccModule.Target().HostCross {

			hostOrTargetString = "host_cross"

		} else if ccModule.Host() {

			hostOrTargetString = "host"

		}

cc/sanitize.go

+15 −0
Original line number Diff line number Diff line
@@ -665,6 +665,21 @@ func (sanitize *sanitize) begin(ctx BaseModuleContext) { 
		s.Diag.Cfi = nil

	}



	// TODO(b/280478629): runtimes don't exist for musl arm64 yet.

	if ctx.toolchain().Musl() && ctx.Arch().ArchType == android.Arm64 {

		s.Address = nil

		s.Hwaddress = nil

		s.Thread = nil

		s.Scudo = nil

		s.Fuzzer = nil

		s.Cfi = nil

		s.Diag.Cfi = nil

		s.Misc_undefined = nil

		s.Undefined = nil

		s.All_undefined = nil

		s.Integer_overflow = nil

	}



	// Also disable CFI for VNDK variants of components

	if ctx.isVndk() && ctx.useVndk() {

		s.Cfi = nil

java/fuzz.go

+3 −1
Original line number Diff line number Diff line
@@ -150,7 +150,9 @@ func (s *javaFuzzPackager) GenerateBuildActions(ctx android.SingletonContext) { 
		}



		hostOrTargetString := "target"

		if javaFuzzModule.Host() {

		if javaFuzzModule.Target().HostCross {

			hostOrTargetString = "host_cross"

		} else if javaFuzzModule.Host() {

			hostOrTargetString = "host"

		}