Merge "Don't disable rust modules for linux_bionic" (0c16fdf7) · Commits · e / os / android_build_soong

rust/compiler.go

+2 −2

Original line number	Diff line number	Diff line
		@@ -216,8 +216,8 @@ 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 primary host target, use the compiler's stdlibs
		if ctx.Host() && ctx.TargetPrimary() {
		// If we're building for the primary arch of the build host, use the compiler's stdlibs
		if ctx.Target().Os == android.BuildOs && ctx.TargetPrimary() {
		stdlib = stdlib + "_" + ctx.toolchain().RustTriple()
		}

+0 −15

Original line number	Diff line number	Diff line
		@@ -560,21 +560,6 @@ func (mod *Module) Init() android.Module {
		android.InitAndroidArchModule(mod, mod.hod, mod.multilib)

		android.InitDefaultableModule(mod)

		// Explicitly disable unsupported targets.
		android.AddLoadHook(mod, func(ctx android.LoadHookContext) {
		disableTargets := struct {
		Target struct {
		Linux_bionic struct {
		Enabled *bool
		}
		}
		}{}
		disableTargets.Target.Linux_bionic.Enabled = proptools.BoolPtr(false)

		ctx.AppendProperties(&disableTargets)
		})

		return mod
		}