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

Commit 4d2f7672 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes I93edfd61,Icd23b542,I58c84607,Icfa73a75 

* changes:
  Pass -fno-sanitize=vptr,function for musl
  Use musl rust prebuilts for USE_HOST_MUSL=true
  Don't package host cross modules in javaFuzzPackager
  Add rust musl arm and arm64 toolchains
parents e3cf1abe 6c18d004

android/arch.go

+3 −1
Original line number Diff line number Diff line
@@ -1825,7 +1825,9 @@ func getCommonTargets(targets []Target) []Target { 
	for _, t := range targets {

		if _, found := set[t.Os.String()]; !found {

			set[t.Os.String()] = true

			ret = append(ret, commonTargetMap[t.Os.String()])

			common := commonTargetMap[t.Os.String()]

			common.HostCross = t.HostCross

			ret = append(ret, common)

		}

	}

cc/sanitize.go

+6 −1
Original line number Diff line number Diff line
@@ -710,8 +710,13 @@ func (sanitize *sanitize) flags(ctx ModuleContext, flags Flags) Flags { 
			// Host sanitizers only link symbols in the final executable, so

			// there will always be undefined symbols in intermediate libraries.

			_, flags.Global.LdFlags = removeFromList("-Wl,--no-undefined", flags.Global.LdFlags)

		}



		if !ctx.toolchain().Bionic() {

			// non-Bionic toolchain prebuilts are missing UBSan's vptr and function san.

			// Musl toolchain prebuilts have vptr and function sanitizers, but enabling them

			// implicitly enables RTTI which causes RTTI mismatch issues with dependencies.



			// non-Bionic toolchain prebuilts are missing UBSan's vptr and function san

			flags.Local.CFlags = append(flags.Local.CFlags, "-fno-sanitize=vptr,function")

		}

java/fuzz.go

+4 −0
Original line number Diff line number Diff line
@@ -171,6 +171,10 @@ func (s *javaFuzzPackager) GenerateBuildActions(ctx android.SingletonContext) { 
			return

		}



		if javaFuzzModule.Target().HostCross {

			return

		}



		fuzzModuleValidator := fuzz.FuzzModule{

			javaFuzzModule.ModuleBase,

			javaFuzzModule.DefaultableModuleBase,

rust/bindgen.go

+17 −2
Original line number Diff line number Diff line
@@ -41,10 +41,25 @@ var ( 


	//TODO(b/160803703) Use a prebuilt bindgen instead of the built bindgen.

	_ = pctx.HostBinToolVariable("bindgenCmd", "bindgen")

	_ = pctx.VariableFunc("bindgenHostPrebuiltTag", func(ctx android.PackageVarContext) string {

		if ctx.Config().UseHostMusl() {

			// This is a hack to use the glibc bindgen binary until we have a musl version checked in.

			return "linux-x86"

		} else {

			return "${config.HostPrebuiltTag}"

		}

	})

	_ = pctx.VariableFunc("bindgenClangLibdir", func(ctx android.PackageVarContext) string {

		if ctx.Config().UseHostMusl() {

			return "musl/lib64/"

		} else {

			return "lib64/"

		}

	})

	_ = pctx.SourcePathVariable("bindgenClang",

		"${cc_config.ClangBase}/${config.HostPrebuiltTag}/${bindgenClangVersion}/bin/clang")

		"${cc_config.ClangBase}/${bindgenHostPrebuiltTag}/${bindgenClangVersion}/bin/clang")

	_ = pctx.SourcePathVariable("bindgenLibClang",

		"${cc_config.ClangBase}/${config.HostPrebuiltTag}/${bindgenClangVersion}/lib64/")

		"${cc_config.ClangBase}/${bindgenHostPrebuiltTag}/${bindgenClangVersion}/${bindgenClangLibdir}")



	//TODO(ivanlozano) Switch this to RuleBuilder

	bindgen = pctx.AndroidStaticRule("bindgen",

rust/compiler.go

+1 −1
Original line number Diff line number Diff line
@@ -372,7 +372,7 @@ func (compiler *baseCompiler) compilerDeps(ctx DepsContext, deps Deps) Deps { 
	if !Bool(compiler.Properties.No_stdlibs) {

		for _, stdlib := range config.Stdlibs {

			// If we're building for the build host, use the prebuilt stdlibs

			if ctx.Target().Os == android.Linux || ctx.Target().Os == android.Darwin {

			if ctx.Host() && !ctx.Target().HostCross {

				stdlib = "prebuilt_" + stdlib

			}

			deps.Stdlibs = append(deps.Stdlibs, stdlib)