Index: tools/build.py |
diff --git a/tools/build.py b/tools/build.py |
index 3ec70d2257ac44b32b520e2c46f3886ab35acbdb..e15b699f5a6bb27e172803f9a92716f2d16bb426 100755 |
--- a/tools/build.py |
+++ b/tools/build.py |
@@ -56,7 +56,7 @@ def BuildOptions(): |
result.add_option("-a", "--arch", |
help='Target architectures (comma-separated).', |
metavar='[all,ia32,x64,simarm,arm,simarmv6,armv6,simarmv5te,armv5te,' |
- 'simmips,mips,simarm64,arm64,]', |
+ 'simmips,mips,simarm64,arm64,simdbc,]', |
default=utils.GuessArchitecture()) |
result.add_option("--os", |
help='Target OSs (comma-separated).', |
@@ -102,7 +102,8 @@ def ProcessOptions(options, args): |
return False |
for arch in options.arch: |
archs = ['ia32', 'x64', 'simarm', 'arm', 'simarmv6', 'armv6', |
- 'simarmv5te', 'armv5te', 'simmips', 'mips', 'simarm64', 'arm64',] |
+ 'simarmv5te', 'armv5te', 'simmips', 'mips', 'simarm64', 'arm64', |
+ 'simdbc',] |
if not arch in archs: |
print "Unknown arch %s" % arch |
return False |
@@ -119,7 +120,8 @@ def ProcessOptions(options, args): |
print ("Cross-compilation to %s is not supported on host os %s." |
% (os_name, HOST_OS)) |
return False |
- if not arch in ['ia32', 'x64', 'arm', 'armv6', 'armv5te', 'arm64', 'mips']: |
+ if not arch in ['ia32', 'x64', 'arm', 'armv6', 'armv5te', 'arm64', 'mips', |
+ 'simdbc',]: |
print ("Cross-compilation to %s is not supported for architecture %s." |
% (os_name, arch)) |
return False |
@@ -137,7 +139,7 @@ def GetToolchainPrefix(target_os, arch, options): |
if target_os == 'android': |
android_toolchain = GetAndroidToolchainDir(HOST_OS, arch) |
- if arch == 'arm': |
+ if arch == 'arm' or arch == 'simdbc': |
return os.path.join(android_toolchain, 'arm-linux-androideabi') |
if arch == 'arm64': |
return os.path.join(android_toolchain, 'aarch64-linux-android') |
@@ -197,7 +199,7 @@ def GetAndroidToolchainDir(host_os, target_arch): |
global THIRD_PARTY_ROOT |
if host_os not in ['linux']: |
raise Exception('Unsupported host os %s' % host_os) |
- if target_arch not in ['ia32', 'x64', 'arm', 'arm64']: |
+ if target_arch not in ['ia32', 'x64', 'arm', 'arm64', 'simdbc']: |
raise Exception('Unsupported target architecture %s' % target_arch) |
# Set up path to the Android NDK. |