Merge branch 'OSMAnd' into 'master'

Fix build failure & native library

* Fixes build failure
* Fixes https://gitlab.com/fdroid/fdroiddata/issues/212

See merge request !764
This commit is contained in:
Daniel Martí 2015-05-12 14:49:37 +00:00
commit 8bf5dad63a

View file

@ -181,6 +181,7 @@ Build:2.0.4,206
Build:2.0.4,207
commit=6c290d170b00119df2771b1509221b46212947e9
subdir=android/OsmAnd
submodules=yes
prebuild=sed -i -e '/qt.*Compile/d' build.gradle && \
sed -i -e "s/System.getenv(\"APK_VERSION\")/\"2.0.4\"/g" build.gradle && \
@ -188,7 +189,8 @@ Build:2.0.4,207
sed -i -e "s/System.getenv(\"APP_FEATURES\")/\"-play_market +gps_status -parking_plugin -blackberry -amazon -route_nav\"/g" build.gradle && \
sed -i -e "s/System.getenv(\"APP_NAME\")/\"OsmAnd~\"/g" build.gradle && \
sed -i -e "s/System.getenv(\"TARGET_APP_NAME\")/\"OsmAnd~\"/g" build.gradle && \
sed -i -e '/sourceSets/icompileOptions {\nsourceCompatibility = JavaVersion.VERSION_1_7\ntargetCompatibility = JavaVersion.VERSION_1_7\n}\n' ../eclipse-compile/appcompat/build.gradle build.gradle
sed -i -e '/sourceSets/icompileOptions {\nsourceCompatibility = JavaVersion.VERSION_1_7\ntargetCompatibility = JavaVersion.VERSION_1_7\n}\n' ../eclipse-compile/appcompat/build.gradle build.gradle && \
sed -i -e '1 iAPP_PLATFORM := android-14' jni/Application.mk
gradle=full,legacy,fat
buildjni=no
ndk=r10d