Make apks build from a single ant .xml template

build/android/ant/sdk-targets.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="chrome_sdk_overrides" >
   <!--
     Redefinition of targets used by SDK tools.
     Supported version: SDK tools revision 20.
@@ skipping 77 matching lines @@
               <filter excludes="${emma.default.filter}"/>
               <filter value="${emma.filter}"/>
             </instr>
           </emma>
         </then>
       </if>
       <!--
         If the project needs a test jar then generate a jar containing
         all compiled classes and referenced jars.
       -->
-      <if condition="${generate.test.jar}">
+      <if condition="${project.is.testapp}">
         <then>
           <echo level="info">Creating test jar file:
               ${ant.project.name}-debug.jar</echo>
           <property-location name="create.test.jar.file"
               location="${CHROMIUM_SRC}/build/android/ant/create-test-jar.js"/>
           <script language="javascript" src="${create.test.jar.file}"/>
         </then>
       </if>
 
     </do-only-if-manifest-hasCode>
@@ skipping 41 matching lines @@
 
         <!-- Zip aligns the APK -->
         <zipalign-helper
           in.package="${out.unaligned.file}"
           out.package="${out.final.file}" />
         <echo level="info">Release Package: ${out.final.file}</echo>
       </sequential>
     </do-only-if-not-library>
     <record-build-info />
   </target>
+
+  <path id="native.libs.gdbserver">
+    <fileset file="${android.gdbserver}"/>
+  </path>
+
+  <target name="-post-compile">
+    <!--
+      Copy gdbserver to main libs directory if building a not-test debug apk.
+      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>
+        <and>
+          <equals arg1="${build.target}" arg2="debug"/>
+          <isfalse value="${project.is.testapp}"/>

[shashi, 2012/09/21 01:53:55]

It may be cleaner to use a different property, like copy.gdbserver than just
relying on project.is.testapp, a test app can have native code and may need
gdbserver, similarly a non test apk may have no native code and may not need gdb
server.

[Yaron, 2012/09/21 01:57:01]

Where is this ever set?

[cjhopman, 2012/09/28 01:14:25]

This is set by Android's build.xml based upon the project's manifest. It is only
set for instrumentation test apks.

[cjhopman, 2012/09/28 01:14:25]

A testapp should only be testing against the java api exposed by the app that it
instruments. A non-testapp might not have native code (though all of ours do).

Adding another variable that can be conditionally set will just make the ant/gyp
files that bit more complicated. Since there is essentially no cost to copying
gdbserver when it isn't actually needed, my preference would be to either copy
gdbserver for all non-testapps or for all apks.

+        </and>
+      </condition>
+      <then>
+        <echo message="Copying gdbserver to the apk to enable native debugging"/>
+        <copy todir="${out.dir}/libs/${target.abi}">
+          <path refid="native.libs.gdbserver"/>
+        </copy>
+      </then>
+    </if>
+
+    <!-- Package all the compiled .class files into a .jar. -->
+    <jar
+      jarfile="${lib.java.dir}/chromium_${PACKAGE_NAME}.jar"
+      basedir="${out.classes.absolute.dir}"
+    />
+  </target>
 </project>