From 09f1766b5ae8001dc451b3818fd0f69334ef7116 Mon Sep 17 00:00:00 2001
From: Boris Kraut <krt@nurfuerspam.de>
Date: Wed, 1 Jul 2015 18:06:45 +0200
Subject: [PATCH] OsmAnd~: Fix build, remove apk

---
 metadata/net.osmand.plus.txt | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/metadata/net.osmand.plus.txt b/metadata/net.osmand.plus.txt
index e7228c1c5e..36eb616080 100644
--- a/metadata/net.osmand.plus.txt
+++ b/metadata/net.osmand.plus.txt
@@ -197,6 +197,7 @@ Build:2.0.4,207
     ndk=r10d
 
 Build:2.1.1,212
+    disable=remove apk
     commit=2.1.1
     subdir=android/OsmAnd
     submodules=yes
@@ -205,12 +206,10 @@ Build:2.1.1,212
         sed -i -e "s/System.getenv(\"APK_NUMBER_VERSION\")/\"$$VERCODE$$\"/g" build.gradle && \
         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 '1 iAPP_PLATFORM := android-14' jni/Application.mk
+        sed -i -e "s/System.getenv(\"TARGET_APP_NAME\")/\"OsmAnd~\"/g" build.gradle
     gradle=full,legacy,fat
     buildjni=no
-    ndk=r10d
+    ndk=r10e
 
 Maintainer Notes:
 No UCMs apply because git never contains actual releases, only pre-releses.