Fix the content_shell.apk in android x86 target build bug

content/shell/android/content_shell_apk.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   Copyright (c) 2012 The Chromium Authors. All rights reserved.
   Use of this source code is governed by a BSD-style license that can be
   found in the LICENSE file.
 -->
 <project name="ContentShell" default="debug" basedir=".">
 
   <description>
     Building ContentShell.apk
   </description>
 
   <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"/>
   <property name="resource.absolute.dir" value="res"/>
   <property name="gen.absolute.dir" value="${out.dir}/gen"/>
   <property name="jar.libs.dir" value="${out.dir}/java/libs"/>
   <path id="native.libs.gdbserver">
     <fileset file="${toolchain.dir}/../../gdbserver"/>
   </path>
   <property name="native.libs.absolute.dir" location="${out.dir}/libs" />
@@ skipping 25 matching lines @@
       TODO(jrg): for now, Chrome on Android always builds native code
       as Release and java/ant as Debug, which means we always install
       gdbserver.  Resolve this discrepancy, possibly by making this
       Release Official build java/ant as Release. -->
     <if>
       <condition>
         <equals arg1="${build.target}" arg2="debug" />
       </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>
 
   <import file="${sdk.dir}/tools/ant/build.xml" />
 
 </project>