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

Commit 003d808a authored by Jaewoong Jung's avatar Jaewoong Jung
Browse files

Remove ModuleBase.prefer32. 

It became obsolte by If96cccbd82ba1311165d61c947c928c6e7cd5593 and
Iaaac16ae171c06d90d04d7cac11789d3f39b8d99

Test: TreeHugger
Change-Id: Ifc8f28663b480ef5aff93a54040339ef080072c9
parent d4b9d045

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)

android/module.go

+0 −6
Original line number Diff line number Diff line
@@ -1149,8 +1149,6 @@ type ModuleBase struct { 


	initRcPaths         Paths

	vintfFragmentsPaths Paths



	prefer32 func(ctx BaseModuleContext, base *ModuleBase, os OsType) bool

}



func (m *ModuleBase) ComponentDepsMutator(BottomUpMutatorContext) {}
@@ -1177,10 +1175,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 {