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

Remove HostPrefer32BitExecutables am: 20780c80a0

Browse Source 
am: 7d168a39dd

Change-Id: Ia014ec84804f60cf37aa22b9f264655b04742ca7
This commit is contained in:
Colin Cross
2016-09-03 00:38:52 +00:00
committed by android-build-merger
parent b87b9f8f58 7d168a39dd
commit 614a039fc6
2 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android/config.go
View File

@@ -337,10 +337,6 @@ func (c *config) DevicePrefer32BitExecutables() bool {
return Bool(c.ProductVariables.DevicePrefer32BitExecutables) return Bool(c.ProductVariables.DevicePrefer32BitExecutables)
} }
func (c *config) HostPrefer32BitExecutables() bool {
return Bool(c.ProductVariables.HostPrefer32BitExecutables)
}
func (c *config) SkipDeviceInstall() bool { func (c *config) SkipDeviceInstall() bool {
return c.EmbeddedInMake() || Bool(c.Mega_device) return c.EmbeddedInMake() || Bool(c.Mega_device)
} }

10
cc/binary.go
View File

@@ -168,13 +168,11 @@ func (binary *binaryDecorator) linkerInit(ctx BaseModuleContext) {
if binary.Properties.Stem == "" && binary.Properties.Suffix == "" { if binary.Properties.Stem == "" && binary.Properties.Suffix == "" {
ctx.PropertyErrorf("symlink_preferred_arch", "must also specify stem or suffix") ctx.PropertyErrorf("symlink_preferred_arch", "must also specify stem or suffix")
} }
var prefer bool prefer32 := false
if ctx.Host() { if ctx.Device() {
prefer = ctx.AConfig().HostPrefer32BitExecutables() prefer32 = ctx.AConfig().DevicePrefer32BitExecutables()
} else {
prefer = ctx.AConfig().DevicePrefer32BitExecutables()
} }
if ctx.PrimaryArch() != prefer { if ctx.PrimaryArch() != prefer32 {
binary.baseInstaller.Properties.Symlinks = append(binary.baseInstaller.Properties.Symlinks, binary.baseInstaller.Properties.Symlinks = append(binary.baseInstaller.Properties.Symlinks,
ctx.ModuleName()) ctx.ModuleName())
} }