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

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

Merge "Fix mismatch between cc and python for windows prefer32"

parents 0bf77198 08117dea

android/arch.go

+5 −1
Original line number Diff line number Diff line
@@ -617,11 +617,15 @@ func archMutator(bpctx blueprint.BottomUpMutatorContext) { 
	}



	// Some modules want compile_multilib: "first" to mean 32-bit, not 64-bit.

	// This is used for Windows support and for HOST_PREFER_32_BIT=true support for Art modules.

	// This is used for HOST_PREFER_32_BIT=true support for Art modules.

	prefer32 := false

	if base.prefer32 != nil {

		prefer32 = base.prefer32(mctx, base, os)

	}

	if os == Windows {

		// Windows builds always prefer 32-bit

		prefer32 = true

	}



	// Determine the multilib selection for this module.

	multilib, extraMultilib := decodeMultilib(base, os.Class)

cc/cc.go

+0 −4
Original line number Diff line number Diff line
@@ -1043,10 +1043,6 @@ func (c *Module) Init() android.Module { 
		c.AddProperties(feature.props()...)

	}



	c.Prefer32(func(ctx android.BaseModuleContext, base *android.ModuleBase, os android.OsType) bool {

		// Windows builds always prefer 32-bit

		return os == android.Windows

	})

	android.InitAndroidArchModule(c, c.hod, c.multilib)

	android.InitApexModule(c)

	android.InitSdkAwareModule(c)