Merge "Remove ModuleBase.prefer32." (daffef24) · Commits · e / os / android_build_soong

android/arch.go

+2 −10

Original line number	Diff line number	Diff line
		@@ -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
		}
		prefer32 := os == Windows

		// Determine the multilib selection for this module.
		multilib, extraMultilib := decodeMultilib(base, os.Class)

+0 −6

Original line number	Diff line number	Diff line
		@@ -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 {