NDK build configure

OsmAnd/.gitignore

@@ -4,3 +4,4 @@ local.properties
 raw/
 obj/
 cpd.xml
+libs/

OsmAnd/build.xml

@@ -38,6 +38,9 @@
          This file is an integral part of the build system for your
          application and should be checked into Version Control Systems. -->
     <loadproperties srcFile="project.properties" />
+	
+	<!-- specify java.compilerArgs if they were not specified -->
+	<property name="java.compilerargs" value=""/>
 
     <!-- quick check on sdk.dir -->
     <fail
@@ -69,14 +72,17 @@
 				<exclude name="**/*.java" />
 			</fileset>
 		</copy>
-		<if> <isset property="net.osmand"/>
+		<if> 
+		  <condition>
+		  		<isset property="net.osmand" />
+		  </condition>
 		  <then>
 		  	<replaceregexp file="AndroidManifest.xml" match='package="net.osmand.plus"' replace='package="net.osmand"' byline="true" />
 		  	<replaceregexp file="res/values/no_translate.xml" match='"app_name"&gt;(.*)&lt;' replace='"app_name"&gt;Osmand&lt;' byline="true" />
 		  </then>
 		  <else>
 		  	<replaceregexp file="AndroidManifest.xml" match='package="net.osmand"' replace='package="net.osmand.plus"' byline="true" />
-		  	<replaceregexp file="res/values/no_translate.xml" match='"app_name"&gt;(.*)&lt;' replace='"app_name"&gt;Osmand&lt;+' byline="true" />
+		  	<replaceregexp file="res/values/no_translate.xml" match='"app_name"&gt;(.*)&lt;' replace='"app_name"&gt;Osmand+&lt;' byline="true" />
 		  </else>
 		</if> 
 	</target>
@@ -227,7 +233,10 @@
             </apkbuilder>
 	</then>
 	 <else>
+	 	<fail message="ndk.dir is missing. Make sure to generate local.properties  or to inject it through an env var" unless="ndk.dir"/>
+	 		
 		<echo>Package helper running: nativeon</echo>
+	 	    <exec command="${ndk.dir}/ndk-build V=1"/>
             <apkbuilder
                     outfolder="${out.absolute.dir}"
                     resourcefile="${resource.package.file.name}"

OsmAnd/libs/armeabi/gdb.setup

@@ -1,2 +0,0 @@
-set solib-search-path /home/victor/projects/OsmAnd/git/OsmAnd/obj/local/armeabi
-directory /home/victor/projects/android-ndk-r6b/platforms/android-8/arch-arm/usr/include /home/victor/projects/OsmAnd/git/OsmAnd/jni/osmand /home/victor/projects/OsmAnd/git/OsmAnd/jni/osmand/../protobuf /home/victor/projects/android//external/skia/include/core /home/victor/projects/android//external/skia/include/utils /home/victor/projects/android//external/skia/include/config /home/victor/projects/android//external/skia/include/effects /home/victor/projects/android//external/skia/include/utils/android /home/victor/projects/android//external/skia/src/core /home/victor/projects/android//system/core/include /home/victor/projects/android//frameworks/base/include /home/victor/projects/android-ndk-r6b/sources/cxx-stl/stlport/stlport /home/victor/projects/android-ndk-r6b/sources/cxx-stl/system/include /home/victor/projects/OsmAnd/git/OsmAnd/jni/protobuf

OsmAnd/res/values/no_translate.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <resources>
-    <string name="app_name">OsmAnd</string>
+    <string name="app_name">Osmand+</string>
     <string name="app_version">0.7.0</string>
     <!-- Not translatable -->
     <string name="ga_api_key">UA-28342846-2</string>