From 2f41b7c8bf0e4c63390984458bc712d20f6e7910 Mon Sep 17 00:00:00 2001 From: Boris Kraut Date: Sat, 21 Feb 2015 16:25:47 +0100 Subject: [PATCH] Linphone: Switch NDK to r10d --- metadata/org.linphone.txt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/metadata/org.linphone.txt b/metadata/org.linphone.txt index 720aa7f10f..910bad1f0f 100644 --- a/metadata/org.linphone.txt +++ b/metadata/org.linphone.txt @@ -71,12 +71,10 @@ Build:2.2.1.1,2211 build=make generate-libs BUILD_SILK=0 BUILD_AMRNB=light BUILD_GPLV3_ZRTP=1 BUILD_G729=0 BUILD_TUNNEL=0 buildjni=no -#note: first prebuild operation is only needed to build openh264 with android NDK r9b which misses some headers for API 12 Build:2.3.2-fdroid,2302 - disable=wait for NDK r10d commit=0f4de68 submodules=yes - prebuild= sed -i 's/NDKLEVEL = 12/NDKLEVEL = 13/' submodules/externals/openh264/build/platform-android.mk && \ + prebuild=\ find submodules/externals/antlr3/runtime/ -mindepth 1 -maxdepth 1 -not -name "C" -exec rm -r {} \; && \ rm -rf gradle liblinphone_tester tests && \ rm -rf submodules/externals/antlr3/antlr-3.4-complete.jar && \ @@ -101,6 +99,7 @@ Build:2.3.2-fdroid,2302 target=android-19 build=make generate-libs BUILD_GPLV3_ZRTP=1 buildjni=no + ndk=r10b Maintainer Notes: * TODO: Clean up (move rm's to rm= field etc.)