From eb80547d636a373962497976ba65ea4bdfd8cd3f Mon Sep 17 00:00:00 2001
From: Alex Zolotarev <alex@mapswithme.com>
Date: Fri, 30 Aug 2013 20:53:10 +0300
Subject: [PATCH] [android] Removed unused build system code

---
 android/common_custom_rules.xml | 21 +++++++++------------
 android/custom_rules.xml        | 31 +++----------------------------
 tools/autobuild/android.sh      |  5 -----
 3 files changed, 12 insertions(+), 45 deletions(-)

diff --git a/android/common_custom_rules.xml b/android/common_custom_rules.xml
index 7dea17dcf8..44d341e437 100644
--- a/android/common_custom_rules.xml
+++ b/android/common_custom_rules.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="MapsWithMe" default="help">
 
-  <property name="arch" value="multiarch" />
-  <property name="mwm.arch.name" value="${arch}"/>
-
   <target name="release" depends="android_rules.release">
   </target>
 
@@ -11,21 +8,21 @@
   </target>
 
   <target name="-setup-production">
-    <property name="out.final.file" location="${out.absolute.dir}/${ant.project.name}${mwm.market.name}-${mwm.arch.name}-production.apk"/>
-    <property name="out.packaged.file" location="${out.absolute.dir}/${ant.project.name}${mwm.market.name}-${mwm.arch.name}-production-unsigned.apk" />
-    <property name="out.unaligned.file" location="${out.absolute.dir}/${ant.project.name}${mwm.market.name}-${mwm.arch.name}-production-unaligned.apk" />
+    <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}-${mwm.arch.name}-release.apk" />
-    <property name="out.packaged.file" location="${out.absolute.dir}/${ant.project.name}${mwm.market.name}-${mwm.arch.name}-release-unsigned.apk" />
-    <property name="out.unaligned.file" location="${out.absolute.dir}/${ant.project.name}${mwm.market.name}-${mwm.arch.name}-release-unaligned.apk" />
+    <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}-${mwm.arch.name}-debug.apk" />
-    <property name="out.packaged.file" location="${out.absolute.dir}/${ant.project.name}${mwm.market.name}-${mwm.arch.name}-debug-unsigned.apk" />
-    <property name="out.unaligned.file" location="${out.absolute.dir}/${ant.project.name}${mwm.market.name}-${mwm.arch.name}-debug-unaligned.apk" />
+    <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">
diff --git a/android/custom_rules.xml b/android/custom_rules.xml
index 88bbed63a6..bfea1bef6d 100644
--- a/android/custom_rules.xml
+++ b/android/custom_rules.xml
@@ -1,34 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="MapsWithMe" default="help">
 
-  <property name="arch" value="multiarch" />
-
-  <condition property="build.type.multi">
-    <equals arg1="${arch}" arg2="multiarch"/>
-  </condition>
-
   <condition property="ndk.buildcommand.suffix" value=".cmd" else="">
     <os family="windows" />
   </condition>
 
-  <target name="-setup-architectures">
-
-    <if condition="${build.type.multi}">
-      <then>
-	<property name="mwm.ndk.abi" value="armeabi armeabi-v7a mips x86"/>
-      </then>
-      <else>
-	<property name="mwm.ndk.abi" value="${arch}"/>
-      </else>
-    </if>
-
-    <echo> ************************************************ </echo>
-    <echo> ***** BUILDING THE FOLLOWING ARCHITECTURES ***** </echo>
-    <echo> ***** ${mwm.ndk.abi}  </echo>
-    <echo> ************************************************ </echo>
-
-  </target>
-
   <property name="jni.absolute.dir" location="jni" />
 
   <target name="clean" depends="android_rules.clean">
@@ -37,9 +13,8 @@
     </exec>
   </target>
 
-  <target name="-ndk-production" depends="-setup-architectures">
+  <target name="-ndk-production">
     <exec executable="bash" failonerror="true">
-      <env key="NDK_ABI_TO_BUILD" value="${mwm.ndk.abi}"/>
       <arg value="${mwm.tools.dir}/autobuild/android.sh"/>
       <arg value="production"/>
     </exec>
@@ -111,7 +86,7 @@
     <record-build-info />
   </target>
 
-  <target name="-ndk-release" depends="-setup-architectures">
+  <target name="-ndk-release">
     <exec executable="bash" failonerror="true">
       <arg value="${mwm.tools.dir}/autobuild/android.sh"/>
       <arg value="release"/>
@@ -125,7 +100,7 @@
   <target name="release" depends="-ndk-release, android_rules.release">
   </target>
 
-  <target name="-ndk-debug" depends="-setup-architectures">
+  <target name="-ndk-debug">
     <exec executable="bash" failonerror="true">
       <arg value="${mwm.tools.dir}/autobuild/android.sh"/>
       <arg value="debug"/>
diff --git a/tools/autobuild/android.sh b/tools/autobuild/android.sh
index a05e7af647..10ecda2f49 100644
--- a/tools/autobuild/android.sh
+++ b/tools/autobuild/android.sh
@@ -24,11 +24,6 @@ export NDK_HOST=$(GetNdkHost) || ( echo "Can't get your OS type, please check to
 
 NDK_ABI_LIST=(armeabi armeabi-v7a mips x86)
 
-if test "${NDK_ABI_TO_BUILD+set}" == set 
-then
-  NDK_ABI_LIST=($NDK_ABI_TO_BUILD);
-fi
-
 for abi in "${NDK_ABI_LIST[@]}"; do
   SHADOW_DIR="${SHADOW_DIR_BASE}-${CONFIGURATION}-${abi}"
   if [[ $# > 1 && "$2" == "clean" ]] ; then