Fix the content_shell.apk in android x86 target build bug

content/shell/android/content_shell_apk.xml

Index: content/shell/android/content_shell_apk.xml
diff --git a/content/shell/android/content_shell_apk.xml b/content/shell/android/content_shell_apk.xml
index 003380bd046721c9231b1c54a6691b315e855f40..9ad848f368863be3fca38662d8d264aaea459769 100644
--- a/content/shell/android/content_shell_apk.xml
+++ b/content/shell/android/content_shell_apk.xml
@@ -13,6 +13,8 @@
   <property environment="env"/>
   <property name="sdk.dir" location="${env.ANDROID_SDK_ROOT}"/>
   <property name="toolchain.dir" location="${env.ANDROID_TOOLCHAIN}"/>
+  <property name="toolchain.dir" location="${env.ANDROID_TOOLCHAIN}"/>
+  <property name="target.arch" value="${env.TARGET_PRODUCT}"/>
   <property name="source.dir" location="java"/>
   <property name="target" value="android-14"/>
   <property name="out.dir" location="${PRODUCT_DIR}/content_shell"/>
@@ -58,9 +60,21 @@
       </condition>
       <then>
         <echo message="Copying gdbserver to the apk to enable native debugging"/>
-        <copy todir="${out.dir}/libs/armeabi">
-          <path refid="native.libs.gdbserver"/>
-        </copy>
+        <if>

[John Grabowski, 2012/05/10 15:06:18]

Can we generalize this a bit more?  E.g. make conditional on setting a var, then
have an unconditional copy.

[Shouqun Liu, 2012/05/11 02:45:23]

Yes, strongly agree, use the APP_ABI argument passed from ant to handle
different cases. In this xml, add property "target.abi" to read APP_ABI, and
also change todir from "${out.dir}/libs/armeabi" to
"${out.dir}/libs/${target.abi}" .   This property is much general. 

+          <condition>
+            <equals arg1="${target.arch}" arg2="x86"/>
+          </condition>
+          <then>
+            <copy todir="${out.dir}/libs/x86">
+              <path refid="native.libs.gdbserver"/>
+            </copy>
+          </then>
+          <else>
+            <copy todir="${out.dir}/libs/armeabi">
+              <path refid="native.libs.gdbserver"/>
+            </copy>
+          </else>
+        </if>
       </then>
     </if>
   </target>