StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove ModuleBase.prefer32."

Browse Source
This commit is contained in:
Jaewoong Jung
2021-02-25 15:39:52 +00:00
committed by Gerrit Code Review
parent 1251bb5775 003d808a41
commit daffef2400
2 changed files with 2 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
android/arch.go
View File

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

6
android/module.go
View File

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