Merge branch 'master' into 'master'

fix nicoWnnG build



See merge request !1058
This commit is contained in:
Boris Kraut 2015-12-06 09:54:28 +00:00
commit 955e9379af

View file

@ -20,18 +20,21 @@ Build:2012.1125.1.1305,201211251
prebuild=sed -i '/debuggable/d' AndroidManifest.xml
target=android-10
buildjni=yes
ndk=r9b
Build:2013.0423.1.1305,201304231
commit=2
prebuild=echo 'NDK_TOOLCHAIN_VERSION=4.4.3' >> jni/Application.mk
target=android-10
buildjni=yes
ndk=r9b
Build:2013.0425.1.1305,201304251
commit=3
prebuild=echo 'NDK_TOOLCHAIN_VERSION=4.4.3' >> jni/Application.mk
target=android-10
buildjni=yes
ndk=r9b
Build:2013.1231.1.1305,201312311
commit=5
@ -39,14 +42,15 @@ Build:2013.1231.1.1305,201312311
sed -i 's/4.4.3/4.6/' jni/Application.mk
target=android-19
buildjni=yes
ndk=r9b
Build:2014.1204.1.1305,201412041
disable=fails to build
commit=6
prebuild=sed -i 's/,--gc-section//g' jni/libwnnDictionary/Android.mk && \
echo 'NDK_TOOLCHAIN_VERSION=4.8' >> jni/Application.mk
echo 'NDK_TOOLCHAIN_VERSION=4.6' >> jni/Application.mk
target=android-19
buildjni=yes
ndk=r9b
Auto Update Mode:None
Update Check Mode:None