Skip to content

Commit 0edccff

Browse files
committed
Build prebuilt libraries for alternate host target
Having a prebuilt for i686 will allow us to handle host binaries consistently rather than using in-tree std for 32-bit host but prebuilt for 64-bit host. Bug: 169347277 Change-Id: I0cf7378364663592f505b7c26065e1bc5ab7cb8c
1 parent c886c6f commit 0edccff

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

build_platform.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,12 @@ def triple():
3333
if build_os == 'darwin':
3434
return 'x86_64-apple-darwin'
3535
raise RuntimeError("Unknown OS: " + build_os)
36+
37+
def alt_triples():
38+
"""Returns the multilib targets for the build environment."""
39+
build_os = system()
40+
if build_os == 'linux':
41+
return ['i686-unknown-linux-gnu']
42+
if build_os == 'darwin':
43+
return []
44+
raise RuntimeError("Unknown OS: " + build_os)

config_toml.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import build_platform
2121
import paths
2222

23-
host_targets = [build_platform.triple()]
23+
host_targets = [build_platform.triple()] + build_platform.alt_triples()
2424
device_targets = ['aarch64-linux-android', 'armv7-linux-androideabi',
2525
'x86_64-linux-android', 'i686-linux-android']
2626
all_targets = host_targets + device_targets

0 commit comments

Comments
 (0)