From 20780c80a0bba03122c682cb6955a07dbee31b1c Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Fri, 2 Sep 2016 14:06:30 -0700 Subject: [PATCH] Remove HostPrefer32BitExecutables HOST_PREFER_32_BIT was used during the switch to 64-bit host tools to keep the SDK building as 32-bit, but is never set any more. Change-Id: I7c2db269d3f7fa1f4e0c022cbced789755a62d81 --- android/config.go | 4 ---- cc/binary.go | 10 ++++------ 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/android/config.go b/android/config.go index b7aac02df..b29012c1c 100644 --- a/android/config.go +++ b/android/config.go @@ -337,10 +337,6 @@ func (c *config) DevicePrefer32BitExecutables() bool { return Bool(c.ProductVariables.DevicePrefer32BitExecutables) } -func (c *config) HostPrefer32BitExecutables() bool { - return Bool(c.ProductVariables.HostPrefer32BitExecutables) -} - func (c *config) SkipDeviceInstall() bool { return c.EmbeddedInMake() || Bool(c.Mega_device) } diff --git a/cc/binary.go b/cc/binary.go index 38fc938f7..b6d66dd15 100644 --- a/cc/binary.go +++ b/cc/binary.go @@ -168,13 +168,11 @@ func (binary *binaryDecorator) linkerInit(ctx BaseModuleContext) { if binary.Properties.Stem == "" && binary.Properties.Suffix == "" { ctx.PropertyErrorf("symlink_preferred_arch", "must also specify stem or suffix") } - var prefer bool - if ctx.Host() { - prefer = ctx.AConfig().HostPrefer32BitExecutables() - } else { - prefer = ctx.AConfig().DevicePrefer32BitExecutables() + prefer32 := false + if ctx.Device() { + prefer32 = ctx.AConfig().DevicePrefer32BitExecutables() } - if ctx.PrimaryArch() != prefer { + if ctx.PrimaryArch() != prefer32 { binary.baseInstaller.Properties.Symlinks = append(binary.baseInstaller.Properties.Symlinks, ctx.ModuleName()) }