diff options
| author | Jan Schmidt <thaytan@noraisin.net> | 2014-02-13 00:21:48 +1100 |
|---|---|---|
| committer | Jan Schmidt <thaytan@noraisin.net> | 2014-02-13 00:24:25 +1100 |
| commit | a2e3a302e6feb9b0cac33b9d299b8b7b215f250c (patch) | |
| tree | 1c9c9de63aa28c88e0c01a57cda3cddfd201f60d | |
| parent | ef53e4d85901777112e930013a315be4e1ab32ea (diff) | |
android: Switch to NDK r9c.
Fixes bug 724177 - android-x86 build issue with zlib.
| -rw-r--r-- | cerbero/bootstrap/android.py | 4 | ||||
| -rw-r--r-- | config/android.config | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cerbero/bootstrap/android.py b/cerbero/bootstrap/android.py index cc239803..7496cb0e 100644 --- a/cerbero/bootstrap/android.py +++ b/cerbero/bootstrap/android.py @@ -27,7 +27,7 @@ from cerbero.utils import shell class AndroidBootstraper (BootstraperBase): NDK_BASE_URL = 'http://dl.google.com/android/ndk/' - NDK_TAR = 'android-ndk-r9-linux-%s.tar.bz2' + NDK_TAR = 'android-ndk-r9c-linux-%s.tar.bz2' def start(self): dest = self.config.toolchain_prefix @@ -40,7 +40,7 @@ class AndroidBootstraper (BootstraperBase): shell.download("%s/%s" % (self.NDK_BASE_URL, ndk_tar), tar) try: shell.call('tar -xvjf %s' % ndk_tar, dest) - shell.call('mv android-ndk-r9/* .', dest) + shell.call('mv android-ndk-r9c/* .', dest) except Exception: pass diff --git a/config/android.config b/config/android.config index 0163365b..76a1924e 100644 --- a/config/android.config +++ b/config/android.config @@ -9,7 +9,7 @@ from cerbero.errors import FatalError import cerbero.utils.messages as m if not toolchain_prefix: - toolchain_prefix = os.path.expanduser('~/cerbero/android-ndk-r9') + toolchain_prefix = os.path.expanduser('~/cerbero/android-ndk-r9c') toolchain_path = None |