diff options
| author | Dan Albert <danalbert@google.com> | 2016-11-28 13:23:59 -0800 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2016-11-28 13:23:59 -0800 |
| commit | ee80f6b25e7d911631ec72afc0df760b5594175f (patch) | |
| tree | 5509fe5a437394dfbd67495bf242c4a0d1023c88 /build/lib | |
| parent | 4aeb7f946d4fba6f0cd54a030e441c3c5d6351e9 (diff) | |
| download | ndk-ee80f6b25e7d911631ec72afc0df760b5594175f.tar.gz | |
Put the mips32 toolchain back.
We now have gradle support for using the mips64 toolchain instead of
the mips32 one for building mips32 code, but that version of Gradle
isn't in Studio 2.2 (the current stable release). 2.3 isn't even in
beta yet, so we can't remove the mips32 toolchain without limiting
our user base to only canary.
I'm putting the mips32 toolchain back, but ndk-build/cmake/standalone
toolchains will continue using the mips64 toolchain. Gradle from 2.2
will use the mips32 toolchain, and Gradle from 2.3 and onward will
use the mips64 toolchain.
Test: ./checkbuild.py
Bug: http://b.android.com/228351
Change-Id: I31501b58502387e4eaa8e8d1589fcf33363a2631
Diffstat (limited to 'build/lib')
| -rw-r--r-- | build/lib/build_support.py | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/build/lib/build_support.py b/build/lib/build_support.py index 59d2ddd37..f0602572e 100644 --- a/build/lib/build_support.py +++ b/build/lib/build_support.py @@ -31,6 +31,7 @@ THIS_DIR = os.path.realpath(os.path.dirname(__file__)) ALL_TOOLCHAINS = ( 'arm-linux-androideabi', 'aarch64-linux-android', + 'mipsel-linux-android', 'mips64el-linux-android', 'x86', 'x86_64', @@ -101,16 +102,9 @@ class Timer(object): def __exit__(self, _exc_type, _exc_value, _traceback): self.finish() -# TODO: Make the x86 toolchain names just be the triple. + def arch_to_toolchain(arch): - return { - 'arm': 'arm-linux-androideabi', - 'arm64': 'aarch64-linux-android', - 'mips': 'mips64el-linux-android', - 'mips64': 'mips64el-linux-android', - 'x86': 'x86', - 'x86_64': 'x86_64', - }[arch] + return dict(zip(ALL_ARCHITECTURES, ALL_TOOLCHAINS))[arch] def arch_to_triple(arch): @@ -118,13 +112,7 @@ def arch_to_triple(arch): def toolchain_to_arch(toolchain): - return { - 'arm-linux-androideabi': 'arm', - 'aarch64-linux-android': 'arm64', - 'mips64el-linux-android': 'mips64', - 'x86': 'x86', - 'x86_64': 'x86_64', - }[toolchain] + return dict(zip(ALL_TOOLCHAINS, ALL_ARCHITECTURES))[toolchain] def arch_to_abis(arch): |