From 15c3b154f8ccf551364a4ab0ef8d97ef36301e48 Mon Sep 17 00:00:00 2001
From: rachytski <siarhei.rachytski@gmail.com>
Date: Sun, 8 Jul 2012 21:14:44 -0700
Subject: [PATCH] [android] fixed build file's issues.

---
 android/MapsWithMeLite/custom_rules.xml | 55 +----------------
 android/MapsWithMePro/custom_rules.xml  | 55 +----------------
 android/common_custom_rules.xml         | 81 +++++++++++++++++++++++++
 android/custom_rules.xml                | 31 +++++-----
 4 files changed, 97 insertions(+), 125 deletions(-)
 create mode 100644 android/common_custom_rules.xml

diff --git a/android/MapsWithMeLite/custom_rules.xml b/android/MapsWithMeLite/custom_rules.xml
index 1f39f4c807..4a82b8d14d 100644
--- a/android/MapsWithMeLite/custom_rules.xml
+++ b/android/MapsWithMeLite/custom_rules.xml
@@ -1,20 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="MapsWithMe" default="help">
 
-  <target name="-exclude-text-drules">
-    <exec executable="rm">
-      <arg value="${asset.absolute.dir}/drules_proto.txt"/>
-    </exec>
-  </target>
-  
-  <target name="-include-text-drules">
-    <exec executable="ln">
-      <arg value="-s"/>
-      <arg value="${mwm.data.dir}/drules_proto.txt"/>
-      <arg value="${asset.absolute.dir}/drules_proto.txt"/>
-    </exec>
-  </target>
-  
   <target name="-set-production-mode" depends="android_rules.-set-mode-check">
     <property name="out.packaged.file" location="${out.absolute.dir}/${ant.project.name}-production-unsigned.apk" />
     <property name="out.final.file" location="${out.absolute.dir}/${ant.project.name}-production.apk" />
@@ -76,46 +62,7 @@
     <record-build-info />
   </target>
 
-  <target name="release" depends="-include-text-drules, android_rules.release">
-  </target>
+  <import file="../common_custom_rules.xml"/>
 
-  <target name="debug" depends="-include-text-drules, android_rules.debug">
-  </target>
-
-  <target name="-include-amazon-appinfo">
-    <exec executable="ln">
-      <arg value="-sf"/>
-      <arg value="${mwm.data.dir}/app_info_amazon.txt"/>
-      <arg value="${asset.absolute.dir}/app_info.txt"/>
-    </exec>
-  </target>
-
-  <target name="amazon-production" depends="-include-amazon-appinfo, production"/>
-  <target name="amazon-release" depends="-include-amazon-appinfo, release"/>
-  <target name="amazon-debug" depends="-include-amazon-appinfo, debug"/>
-
-  <target name="-include-google-appinfo">
-    <exec executable="ln">
-      <arg value="-sf"/>
-      <arg value="${mwm.data.dir}/app_info_google.txt"/>
-      <arg value="${asset.absolute.dir}/app_info.txt"/>
-    </exec>
-  </target>
-
-  <target name="google-production" depends="-include-google-appinfo, production"/>
-  <target name="google-release" depends="-include-google-appinfo, release"/>
-  <target name="google-debug" depends="-include-google-appinfo, debug"/>
-
-  <target name="-include-samsung-appinfo">
-    <exec executable="ln">
-      <arg value="-sf"/>
-      <arg value="${mwm.data.dir}/app_info_samsung.txt"/>
-      <arg value="${asset.absolute.dir}/app_info.txt"/>
-    </exec>
-  </target>
-
-  <target name="samsung-production" depends="-include-samsung-appinfo, production"/>
-  <target name="samsung-release" depends="-include-samsung-appinfo, release"/>
-  <target name="samsung-debug" depends="-include-samsung-appinfo, debug"/>
 </project>
 
diff --git a/android/MapsWithMePro/custom_rules.xml b/android/MapsWithMePro/custom_rules.xml
index 1f39f4c807..4a82b8d14d 100644
--- a/android/MapsWithMePro/custom_rules.xml
+++ b/android/MapsWithMePro/custom_rules.xml
@@ -1,20 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="MapsWithMe" default="help">
 
-  <target name="-exclude-text-drules">
-    <exec executable="rm">
-      <arg value="${asset.absolute.dir}/drules_proto.txt"/>
-    </exec>
-  </target>
-  
-  <target name="-include-text-drules">
-    <exec executable="ln">
-      <arg value="-s"/>
-      <arg value="${mwm.data.dir}/drules_proto.txt"/>
-      <arg value="${asset.absolute.dir}/drules_proto.txt"/>
-    </exec>
-  </target>
-  
   <target name="-set-production-mode" depends="android_rules.-set-mode-check">
     <property name="out.packaged.file" location="${out.absolute.dir}/${ant.project.name}-production-unsigned.apk" />
     <property name="out.final.file" location="${out.absolute.dir}/${ant.project.name}-production.apk" />
@@ -76,46 +62,7 @@
     <record-build-info />
   </target>
 
-  <target name="release" depends="-include-text-drules, android_rules.release">
-  </target>
+  <import file="../common_custom_rules.xml"/>
 
-  <target name="debug" depends="-include-text-drules, android_rules.debug">
-  </target>
-
-  <target name="-include-amazon-appinfo">
-    <exec executable="ln">
-      <arg value="-sf"/>
-      <arg value="${mwm.data.dir}/app_info_amazon.txt"/>
-      <arg value="${asset.absolute.dir}/app_info.txt"/>
-    </exec>
-  </target>
-
-  <target name="amazon-production" depends="-include-amazon-appinfo, production"/>
-  <target name="amazon-release" depends="-include-amazon-appinfo, release"/>
-  <target name="amazon-debug" depends="-include-amazon-appinfo, debug"/>
-
-  <target name="-include-google-appinfo">
-    <exec executable="ln">
-      <arg value="-sf"/>
-      <arg value="${mwm.data.dir}/app_info_google.txt"/>
-      <arg value="${asset.absolute.dir}/app_info.txt"/>
-    </exec>
-  </target>
-
-  <target name="google-production" depends="-include-google-appinfo, production"/>
-  <target name="google-release" depends="-include-google-appinfo, release"/>
-  <target name="google-debug" depends="-include-google-appinfo, debug"/>
-
-  <target name="-include-samsung-appinfo">
-    <exec executable="ln">
-      <arg value="-sf"/>
-      <arg value="${mwm.data.dir}/app_info_samsung.txt"/>
-      <arg value="${asset.absolute.dir}/app_info.txt"/>
-    </exec>
-  </target>
-
-  <target name="samsung-production" depends="-include-samsung-appinfo, production"/>
-  <target name="samsung-release" depends="-include-samsung-appinfo, release"/>
-  <target name="samsung-debug" depends="-include-samsung-appinfo, debug"/>
 </project>
 
diff --git a/android/common_custom_rules.xml b/android/common_custom_rules.xml
new file mode 100644
index 0000000000..0dd2b1d489
--- /dev/null
+++ b/android/common_custom_rules.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="MapsWithMe" default="help">
+
+  <target name="-exclude-text-drules">
+    <exec executable="rm">
+      <arg value="${asset.absolute.dir}/drules_proto.txt"/>
+    </exec>
+  </target>
+  
+  <target name="-include-text-drules">
+    <exec executable="ln">
+      <arg value="-s"/>
+      <arg value="${mwm.data.dir}/drules_proto.txt"/>
+      <arg value="${asset.absolute.dir}/drules_proto.txt"/>
+    </exec>
+  </target>
+
+  <target name="release" depends="-include-text-drules, android_rules.release">
+  </target>
+
+  <target name="debug" depends="-include-text-drules, android_rules.debug">
+  </target>
+
+  <target name="-setup-production">
+    <property name="out.final.file" location="${out.absolute.dir}/${ant.project.name}${mwm.market.name}-production.apk"/>
+    <property name="out.packaged.file" location="${out.absolute.dir}/${ant.project.name}${mwm.market.name}-production-unsigned.apk" />
+    <property name="out.unaligned.file" location="${out.absolute.dir}/${ant.project.name}${mwm.market.name}-production-unaligned.apk" />
+  </target>
+
+  <target name="-setup-release">
+    <property name="out.final.file" location="${out.absolute.dir}/${ant.project.name}${mwm.market.name}-release.apk" />
+    <property name="out.packaged.file" location="${out.absolute.dir}/${ant.project.name}${mwm.market.name}-release-unsigned.apk" />
+    <property name="out.unaligned.file" location="${out.absolute.dir}/${ant.project.name}${mwm.market.name}-release-unaligned.apk" />
+  </target>
+
+  <target name="-setup-debug">
+    <property name="out.final.file" location="${out.absolute.dir}/${ant.project.name}${mwm.market.name}-debug.apk" />
+    <property name="out.packaged.file" location="${out.absolute.dir}/${ant.project.name}${mwm.market.name}-debug-unsigned.apk" />
+    <property name="out.unaligned.file" location="${out.absolute.dir}/${ant.project.name}${mwm.market.name}-debug-unaligned.apk" />
+  </target>
+
+  <target name="-setup-amazon-market">
+    <property name="mwm.market.name" value="-amazon"/>
+    <exec executable="ln">
+      <arg value="-sf"/>
+      <arg value="${mwm.data.dir}/app_info_amazon.txt"/>
+      <arg value="${asset.absolute.dir}/app_info.txt"/>
+    </exec>
+  </target>
+
+  <target name="amazon-production" depends="-setup-amazon-market, -setup-production, production"/>
+  <target name="amazon-release" depends="-setup-amazon-market, -setup-release, release"/>
+  <target name="amazon-debug" depends="-setup-amazon-market, -setup-debug, debug"/>
+
+  <target name="-setup-google-market">
+    <property name="mwm.market.name" value="-google"/>
+    <exec executable="ln">
+      <arg value="-sf"/>
+      <arg value="${mwm.data.dir}/app_info_google.txt"/>
+      <arg value="${asset.absolute.dir}/app_info.txt"/>
+    </exec>
+  </target>
+
+  <target name="google-production" depends="-setup-google-market, -setup-production, production"/>
+  <target name="google-release" depends="-setup-google-market, -setup-release, release"/>
+  <target name="google-debug" depends="-setup-google-market, -setup-debug, debug"/>
+
+  <target name="-setup-samsung-market">
+    <property name="mwm.market.name" value="-samsung"/>
+    <exec executable="ln">
+      <arg value="-sf"/>
+      <arg value="${mwm.data.dir}/app_info_samsung.txt"/>
+      <arg value="${asset.absolute.dir}/app_info.txt"/>
+    </exec>
+  </target>
+
+  <target name="samsung-production" depends="-setup-samsung-market, -setup-production, production"/>
+  <target name="samsung-release" depends="-setup-samsung-market, -setup-release, release"/>
+  <target name="samsung-debug" depends="-setup-samsung-market, -setup-debug, debug"/>
+
+</project>
diff --git a/android/custom_rules.xml b/android/custom_rules.xml
index 24ec1ae699..43078257e9 100644
--- a/android/custom_rules.xml
+++ b/android/custom_rules.xml
@@ -1,31 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="MapsWithMe" default="help">
 
+  <property name="jni.absolute.dir" location="jni" />
+
   <target name="clean" depends="android_rules.clean">
     <exec executable="${ndk.dir}/ndk-build" failonerror="true">
       <arg value="clean"/>
     </exec>
   </target>
 
-  <target name="-exclude-text-drules">
-    <exec executable="rm">
-      <arg value="${asset.absolute.dir}/drules_proto.txt"/>
-    </exec>
-  </target>
-  
-  <target name="-include-text-drules">
-    <exec executable="ln">
-      <arg value="-s"/>
-      <arg value="${mwm.data.dir}/drules_proto.txt"/>
-      <arg value="${asset.absolute.dir}/drules_proto.txt"/>
-    </exec>
-  </target>
-  
   <target name="-ndk-production">
     <exec executable="bash" failonerror="true">
       <arg value="${mwm.tools.dir}/autobuild/android.sh"/>
       <arg value="production"/>
     </exec>
+    <exec executable="touch">
+      <arg value="${jni.absolute.dir}/com/mapswithme/core/jni_helper.cpp"/>
+    </exec>
     <exec executable="${ndk.dir}/ndk-build" failonerror="true">
       <arg value="NDK_DEBUG=0"/>
       <arg value="PRODUCTION=1"/>
@@ -67,7 +58,7 @@
     </if>
   </target>
 
-  <target name="production" depends="-exclude-text-drules, -ndk-production, -set-production-mode,                                                                                
+  <target name="production" depends="-ndk-production, -set-production-mode,                                                                                
 				     android_rules.-release-obfuscation-check, android_rules.-package, android_rules.-release-prompt-for-password, android_rules.-release-nosign"
           if="has.keystore" description="Production target - almost the same as release, but with real word config.">
     <!-- only create apk if *not* a library project -->
@@ -99,13 +90,16 @@
       <arg value="${mwm.tools.dir}/autobuild/android.sh"/>
       <arg value="release"/>
     </exec>
+    <exec executable="touch">
+      <arg value="${jni.absolute.dir}/com/mapswithme/core/jni_helper.cpp"/>
+    </exec>
     <exec executable="${ndk.dir}/ndk-build" failonerror="true">
       <arg value="NDK_DEBUG=0"/>
       <arg value="V=1"/>
     </exec>
   </target>
 
-  <target name="release" depends="-include-text-drules, -ndk-release, android_rules.release">
+  <target name="release" depends="-ndk-release, android_rules.release">
   </target>
 
   <target name="-ndk-debug">
@@ -113,13 +107,16 @@
           <arg value="${mwm.tools.dir}/autobuild/android.sh"/>
           <arg value="debug"/>
     </exec>
+    <exec executable="touch">
+      <arg value="${jni.absolute.dir}/com/mapswithme/core/jni_helper.cpp"/>
+    </exec>
     <exec executable="${ndk.dir}/ndk-build" failonerror="true">
           <arg value="NDK_DEBUG=1"/>
           <arg value="V=1"/>
     </exec>
   </target>
 
-  <target name="debug" depends="-include-text-drules, -ndk-debug, android_rules.debug">
+  <target name="debug" depends="-ndk-debug, android_rules.debug">
   </target>
 
   <target name="-include-amazon-appinfo">