diff options
| -rw-r--r-- | cerbero/bootstrap/android.py | 4 | ||||
| -rw-r--r-- | config/android.config | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/cerbero/bootstrap/android.py b/cerbero/bootstrap/android.py index 7496cb0e..5823be84 100644 --- a/cerbero/bootstrap/android.py +++ b/cerbero/bootstrap/android.py @@ -27,11 +27,11 @@ from cerbero.utils import shell class AndroidBootstraper (BootstraperBase): NDK_BASE_URL = 'http://dl.google.com/android/ndk/' - NDK_TAR = 'android-ndk-r9c-linux-%s.tar.bz2' + NDK_TAR = 'android-ndk-r9c-%s-%s.tar.bz2' def start(self): dest = self.config.toolchain_prefix - ndk_tar = self.NDK_TAR % self.config.arch + ndk_tar = self.NDK_TAR % (self.config.platform, self.config.arch) tar = os.path.join(dest, ndk_tar) try: os.makedirs(dest) diff --git a/config/android.config b/config/android.config index 76a1924e..e2dacc6d 100644 --- a/config/android.config +++ b/config/android.config @@ -18,7 +18,7 @@ if target_arch == Architecture.ARM or target_arch == Architecture.ARMv7: _arch = 'arm' for tc_version in ['4.8', '4.7', '4.6']: - for tc_arch in ['linux-x86', 'linux-x86_64']: + for tc_arch in ['darwin-x86', 'darwin-x86_64', 'linux-x86', 'linux-x86_64']: tmp = '%s/toolchains/arm-linux-androideabi-%s/prebuilt/%s/bin' % (toolchain_prefix, tc_version, tc_arch) if os.path.exists(tmp): toolchain_path = tmp @@ -29,7 +29,7 @@ elif target_arch == Architecture.X86: tools_prefix = 'i686-linux-android' _arch = 'x86' for tc_version in ['4.8', '4.7', '4.6']: - for tc_arch in ['linux-x86', 'linux-x86_64']: + for tc_arch in ['darwin-x86', 'darwin-x86_64', 'linux-x86', 'linux-x86_64']: tmp = '%s/toolchains/x86-%s/prebuilt/%s/bin' % (toolchain_prefix, tc_version, tc_arch) if os.path.exists(tmp): toolchain_path = tmp |