From 03e7f3b6599db8a663c21b386fc8ec06ea62465e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D8=A3=D8=AD=D9=85=D8=AF=20=D8=A7=D9=84=D9=85=D8=AD=D9=85?= =?UTF-8?q?=D9=88=D8=AF=D9=8A=20=28Ahmed=20El-Mahmoudy=29?= Date: Tue, 12 May 2015 16:42:21 +0200 Subject: [PATCH 1/2] OsmAnd~: fixed build of native library Fixes: https://gitlab.com/fdroid/fdroiddata/issues/212 --- metadata/net.osmand.plus.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/metadata/net.osmand.plus.txt b/metadata/net.osmand.plus.txt index 10b4d0962b..f0bd63a0df 100644 --- a/metadata/net.osmand.plus.txt +++ b/metadata/net.osmand.plus.txt @@ -188,7 +188,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 From 18e12ff5a47f99ff43252c9079152b7fd8b5a369 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D8=A3=D8=AD=D9=85=D8=AF=20=D8=A7=D9=84=D9=85=D8=AD=D9=85?= =?UTF-8?q?=D9=88=D8=AF=D9=8A=20=28Ahmed=20El-Mahmoudy=29?= Date: Tue, 12 May 2015 16:45:54 +0200 Subject: [PATCH 2/2] OsmAnd~: Fix build failure --- metadata/net.osmand.plus.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/metadata/net.osmand.plus.txt b/metadata/net.osmand.plus.txt index f0bd63a0df..9aaabaa8d9 100644 --- a/metadata/net.osmand.plus.txt +++ b/metadata/net.osmand.plus.txt @@ -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 && \