Merge branch 'master' into 'master'
Fix Linphone build with android NDK r9b For some reason, this specific NDK version misses some needed system headers. I fixed it by using API 13 instead of API 12 to build submodule openh264. See merge request !447
This commit is contained in:
commit
6f8c52b221
|
@ -71,11 +71,13 @@ 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
|
build=make generate-libs BUILD_SILK=0 BUILD_AMRNB=light BUILD_GPLV3_ZRTP=1 BUILD_G729=0 BUILD_TUNNEL=0
|
||||||
buildjni=no
|
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
|
Build:2.3.2-fdroid,2302
|
||||||
disable=wait for NDK r10d
|
disable=wait for NDK r10d
|
||||||
commit=0f4de68
|
commit=0f4de68
|
||||||
submodules=yes
|
submodules=yes
|
||||||
prebuild= find submodules/externals/antlr3/runtime/ -mindepth 1 -maxdepth 1 -not -name "C" -exec rm -r {} \; && \
|
prebuild= sed -i 's/NDKLEVEL = 12/NDKLEVEL = 13/' submodules/externals/openh264/build/platform-android.mk && \
|
||||||
|
find submodules/externals/antlr3/runtime/ -mindepth 1 -maxdepth 1 -not -name "C" -exec rm -r {} \; && \
|
||||||
rm -rf gradle liblinphone_tester tests && \
|
rm -rf gradle liblinphone_tester tests && \
|
||||||
rm -rf submodules/externals/antlr3/antlr-3.4-complete.jar && \
|
rm -rf submodules/externals/antlr3/antlr-3.4-complete.jar && \
|
||||||
rm -rf submodules/externals/antlr3/antlr-ant && \
|
rm -rf submodules/externals/antlr3/antlr-ant && \
|
||||||
|
|
Loading…
Reference in a new issue