tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Remove ModuleBase.prefer32." am: daffef2400

Browse source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1606486

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibbc275d061ac6385322dae7062d0847a57f3bb38
This commit is contained in:
Jaewoong Jung 2021-02-25 16:32:03 +00:00 committed by Automerger Merge Worker
commit c520303826
2 changed files with 2 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
android/arch.go
View file

@ -616,16 +616,8 @@ func archMutator(bpctx blueprint.BottomUpMutatorContext) {
osTargets = []Target{osTargets[0]}
}
// Some modules want compile_multilib: "first" to mean 32-bit, not 64-bit.
// 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
}
// Windows builds always prefer 32-bit
prefer32 := os == Windows
// Determine the multilib selection for this module.
multilib, extraMultilib := decodeMultilib(base, os.Class)

6
android/module.go
View file

@ -1168,8 +1168,6 @@ type ModuleBase struct {
initRcPaths Paths
vintfFragmentsPaths Paths
prefer32 func(ctx BaseModuleContext, base *ModuleBase, os OsType) bool
}
func (m *ModuleBase) ComponentDepsMutator(BottomUpMutatorContext) {}
@ -1196,10 +1194,6 @@ func (m *ModuleBase) VariablesForTests() map[string]string {
return m.variables
}
func (m *ModuleBase) Prefer32(prefer32 func(ctx BaseModuleContext, base *ModuleBase, os OsType) bool) {
m.prefer32 = prefer32
}
// Name returns the name of the module. It may be overridden by individual module types, for
// example prebuilts will prepend prebuilt_ to the name.
func (m *ModuleBase) Name() string {