diff options
| author | Colin Cross <ccross@android.com> | 2016-09-02 14:06:30 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2016-09-02 14:06:30 -0700 |
| commit | 20780c80a0bba03122c682cb6955a07dbee31b1c (patch) | |
| tree | 143a68e42b1ae3a731a760779f7e4efa089917d6 /cc | |
| parent | 72301d978a16ba0b3a54eb899b5e73af7b29c0e9 (diff) | |
| download | build_soong-20780c80a0bba03122c682cb6955a07dbee31b1c.tar.gz build_soong-20780c80a0bba03122c682cb6955a07dbee31b1c.tar.bz2 build_soong-20780c80a0bba03122c682cb6955a07dbee31b1c.zip | |
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
Diffstat (limited to 'cc')
| -rw-r--r-- | cc/binary.go | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/cc/binary.go b/cc/binary.go index 38fc938f..b6d66dd1 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()) } |