diff options
| author | Sebastian Dröge <sebastian@centricular.com> | 2014-11-05 09:29:06 +0100 |
|---|---|---|
| committer | Sebastian Dröge <sebastian@centricular.com> | 2014-11-05 09:37:56 +0100 |
| commit | 31350eecd9152f952201abfbabddcc8c143b14e2 (patch) | |
| tree | 5536ca969522a71f27ab2a19dd77de5a63007f2c | |
| parent | 036c6ca587f66ad7df6f74038ff7212143ccffbd (diff) | |
android: Update to Android NDK r10c
| -rw-r--r-- | cerbero/bootstrap/android.py | 7 | ||||
| -rw-r--r-- | config/android.config | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/cerbero/bootstrap/android.py b/cerbero/bootstrap/android.py index bebdce95..a5803146 100644 --- a/cerbero/bootstrap/android.py +++ b/cerbero/bootstrap/android.py @@ -27,7 +27,7 @@ from cerbero.utils import shell class AndroidBootstrapper (BootstrapperBase): NDK_BASE_URL = 'http://dl.google.com/android/ndk/' - NDK_TAR = 'android-ndk-r9d-%s-%s.tar.bz2' + NDK_TAR = 'android-ndk-r10c-%s-%s.bin' def start(self): dest = self.config.toolchain_prefix @@ -40,8 +40,9 @@ class AndroidBootstrapper (BootstrapperBase): shell.download("%s/%s" % (self.NDK_BASE_URL, ndk_tar), tar) if not os.path.exists(os.path.join(dest, "README.TXT")): try: - shell.call('tar -xvjf %s' % ndk_tar, dest) - shell.call('mv android-ndk-r9d/* .', dest) + shell.call('chmod +x ./%s' % ndk_tar, dest) + shell.call('./%s' % ndk_tar, dest) + shell.call('mv android-ndk-r10c/* .', dest) except Exception: pass diff --git a/config/android.config b/config/android.config index feba5fbd..228c92ba 100644 --- a/config/android.config +++ b/config/android.config @@ -11,7 +11,7 @@ import cerbero.utils.messages as m variants += ['nogtk3', 'noclutter', 'nopython', 'notestspackage'] if not toolchain_prefix: - toolchain_prefix = os.path.join(home_dir, 'android-ndk-r9d') + toolchain_prefix = os.path.join(home_dir, 'android-ndk-r10c') toolchain_path = None |