From af142c6af328a7eb4db98f4cf7e204b583cd4066 Mon Sep 17 00:00:00 2001
From: David Black <david8black@gmail.com>
Date: Tue, 6 Aug 2013 10:05:04 +0100
Subject: [PATCH] activate other osmand ABIs

---
 metadata/net.osmand.plus.txt | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/metadata/net.osmand.plus.txt b/metadata/net.osmand.plus.txt
index 80314ef3d6..7fe505abdc 100644
--- a/metadata/net.osmand.plus.txt
+++ b/metadata/net.osmand.plus.txt
@@ -9,6 +9,9 @@ Name:OsmAnd~
 Auto Name:OsmAnd~
 Summary:Maps & navigation; online and off
 Description:
+'''N.B''' Each apk is labelled according to the CPU architecture which it is 
+designed to run on; if in doubt, use ARM. 
+
 Osmand~'s features can be extended by enabling the plugins 
 via the settings, which include online
 maps from many sources, tracking, OSM editing and accessibility enhancements.
@@ -20,13 +23,10 @@ within the app and there is a desktop program available on the website as well
 for creating your own.
 
 Osmand~ is the generic name for builds of Osmand not done by the developers.
-
-Status: We have technical difficulties building the latest versions.
 .
 
-#Each apk is labelled according to the CPU architecture which it is designed
-#to run on. 
 
+# Name srclibs in such a way as to replicate OsmAnd build tree
 Repo Type:srclib
 Repo:android
 
@@ -56,38 +56,37 @@ cp ../DataExtractionOSM/build/OsmAndMapCreator.jar libs/ && \
 zip -d libs/OsmAndMapCreator.jar net/osmand/LogUtil.class && \
 cp -r ../DataExtractionOSM/build/lib/ libs/
 
-# Name srclibs in such a way as to replicate OsmAnd build tree
-# Could try making https://github.com/osmandapp/OsmAnd-external-qtbase a srclib too
-# Don't really understand what the other build.xmls do: they don't appear to put jars in classpath
-# Jars haven't been verified
-
-Build Version:1.5-MIPS,143,!r1.5,subdir=OsmAnd,\
+Build Version:1.5-MIPS,143,r1.5,subdir=OsmAnd,\
 forcevercode=yes,\
 rm=SherlockBar/build.xml,\
 encoding=utf-8,\
 srclibs=tools@bfee93a8d;core@r1.1.4;resources@836be71481,\
+extlibs=perms-osmand_145.diff,\
 patch=remove_analytics_android_145.diff,\
 prebuild=rm ../../core/OsmAnd-java/src/net/osmand/plus/download/DownloadTracker.java && \
          sed -i 's/debuggable="true"/debuggable="false"/g' AndroidManifest.xml && \
          $$SDK$$/tools/android update project -p ../SherlockBar && \
          sed -i 's/app_version">[^<]*/app_version">1.5-MIPS/' \
-           res/values/no_translate.xml && sed -i '/keys/d' ant.properties,\
+           res/values/no_translate.xml && sed -i '/keys/d' ant.properties && \
+         cd ../../core/ && git apply ../android/OsmAnd/libs/perms-osmand_145.diff,\
 build=ANDROID_SDK=$$SDK$$ ANDROID_NDK=$$NDK$$ OSMAND_MIPS_ONLY=true ./ndk-build.sh && \
       ant jar native-libs -f $$tools$$/OsmAndMapCreator/build.xml && \
       ant build -f ../OsmAnd-java/build.xml,\
 buildjni=no
 
-Build Version:1.5-x86,144,!r1.5,subdir=OsmAnd,\
+Build Version:1.5-x86,144,r1.5,subdir=OsmAnd,\
 forcevercode=yes,\
 rm=SherlockBar/build.xml,\
 encoding=utf-8,\
 srclibs=tools@bfee93a8d;core@r1.1.4;resources@836be71481,\
+extlibs=perms-osmand_145.diff,\
 patch=remove_analytics_android_145.diff,\
 prebuild=rm ../../core/OsmAnd-java/src/net/osmand/plus/download/DownloadTracker.java && \
          sed -i 's/debuggable="true"/debuggable="false"/g' AndroidManifest.xml && \
          $$SDK$$/tools/android update project -p ../SherlockBar && \
          sed -i 's/app_version">[^<]*/app_version">1.5-X86/' \
-           res/values/no_translate.xml && sed -i '/keys/d' ant.properties,\
+           res/values/no_translate.xml && sed -i '/keys/d' ant.properties && \
+         cd ../../core/ && git apply ../android/OsmAnd/libs/perms-osmand_145.diff,\
 build=ANDROID_SDK=$$SDK$$ ANDROID_NDK=$$NDK$$ OSMAND_X86_ONLY=true ./ndk-build.sh && \
       ant jar native-libs -f $$tools$$/OsmAndMapCreator/build.xml && \
       ant build -f ../OsmAnd-java/build.xml,\
@@ -111,6 +110,8 @@ build=ANDROID_SDK=$$SDK$$ ANDROID_NDK=$$NDK$$ OSMAND_ARM_ONLY=true ./ndk-build.s
       ant build -f ../OsmAnd-java/build.xml,\
 buildjni=no
 
+# Could build gnu-trove via srclib
+# Don't really understand what the other build.xmls do: they don't appear to put jars in classpath
 # Qt in new_core branch
 # see https://github.com/osmandapp/OsmAnd-manifest/blob/master/current_release.xml 
 Auto Update Mode:None