GNOME Bugzilla – Bug 763902
cerbero: a few NDK r11 related bugfixes
Last modified: 2016-10-31 14:15:49 UTC
Hi, I noticed two bugs with the latest NDK r11, all minor fixes. With the attached two patches applied in the order given, I can build the cross-android gstreamer package using cerbero. Without the patches, I'm getting a crash during the NDK extraction step. Note that the first patch is the one that fixes the bugs; the second is just cleanup I noticed along the way.
Created attachment 324312 [details] [review] 0001-android-fix-NDK-r11-extraction-bug.patch
Created attachment 324313 [details] [review] 0002-android-rename-variables-from-tar-zip.patch
Review of attachment 324312 [details] [review]: ::: cerbero/bootstrap/android.py @@ +43,3 @@ try: shell.call('unzip %s' % ndk_tar, dest) + shell.call('mv android-ndk-%s/* .' % self.NDK_VERSION, dest) I assume you're building on OSX? Because the Linux version of the zip extracts a directory called android-ndk-r11-linux-x86_64.tar.bz2 for whatever reason. We'll have to either use globs here or platform specific directory names.
Interesting; I'm actually on Linux. Perhaps Google changed this between r10a and r10b of the NDK. In the current version, I'm seeing everything extracted to a directory called android-ndk-r11b. Here's the link I'm looking at: http://dl.google.com/android/repository/android-ndk-r11b-linux-x86_64.zip Coming from this page: https://developer.android.com/ndk/downloads/index.html
Ah, I was using r11 (no a or b). It also looked like a mistake to me, so they probably changed it. I'll merge your changes tomorrow. Thanks!
commit b6f651df0ea90eea5067141948a0dac8b2896a04 Author: Sebastian Dröge <sebastian@centricular.com> Date: Mon Mar 21 10:54:56 2016 +0200 android: Update to ndk r11b r11 had broken zip files. https://bugzilla.gnome.org/show_bug.cgi?id=763902 commit adddff3abf85782cf97d4cb309a956fc4e033c73 Author: Martin Kelly <martin@surround.io> Date: Fri Mar 18 18:21:04 2016 -0700 android: rename variables from tar --> zip A few variables refer to a tar file, but the file is actually zip, so rename them to prevent confusion. https://bugzilla.gnome.org/show_bug.cgi?id=763902 commit 49bc3ba9ac57a595040021687716b31f0c09eb06 Author: Martin Kelly <martin@surround.io> Date: Fri Mar 18 16:33:22 2016 -0700 android: fix NDK r11 extraction bug The switch to NDK r11 introduced two small bugs during the bootstrap process: - Referencing a tar.bz2 file that does not exist. Fix by referencing the correct zip file. - Referencing README.TXT, which no longer exists. Fix by referencing a file that does exist and should continue to exist in the future (ndk-build). https://bugzilla.gnome.org/show_bug.cgi?id=763902