Copying gdbserver to the apk to enable native debugging for native_test_apk

testing/android/native_test_apk.xml

Index: testing/android/native_test_apk.xml
diff --git a/testing/android/native_test_apk.xml b/testing/android/native_test_apk.xml
index fe2db25eb8bbd366196def54c3346bd6f19150c4..fff76710f789e965caf0c7a1955cda4e793dfe6c 100644
--- a/testing/android/native_test_apk.xml
+++ b/testing/android/native_test_apk.xml
@@ -14,10 +14,15 @@ found in the LICENSE file.
   <property environment="env"/>
   <property name="sdk.dir" location="${env.ANDROID_SDK_ROOT}"/>
   <property name="sdk.version" value="${env.ANDROID_SDK_VERSION}"/>
+  <property name="toolchain.dir" location="${env.ANDROID_TOOLCHAIN}"/>
   <property name="src" location="."/>
   <property name="source.dir" location="java"/>
+  <property name="target.abi" value="${APP_ABI}"/>
 
   <property name="target" value="android-${env.ANDROID_SDK_VERSION}"/>
+  <path id="native.libs.gdbserver">
+    <fileset file="${toolchain.dir}/../../gdbserver"/>
+  </path>
 
   <condition property="location.base" 
              value="${sdk.dir}" 
@@ -57,6 +62,21 @@ found in the LICENSE file.
   <property name="native.libs.absolute.dir" location="${out.dir}/libs" />
   -->
 
+  <target name="-post-compile">
+    <!-- copy gdbserver to main libs directory if building debug. -->
+    <if>
+      <condition>
+        <equals arg1="${build.target}" arg2="debug" />
+      </condition>
+      <then>
+        <echo message="Copying gdbserver to the apk to enable native debugging"/>

[bulach, 2012/07/06 09:59:12]

I don't know much about this, but... does it need to be part of each APK? can we
copy it out of band via build/android/test_package_apk.py:StripAndCopyExecutable
(that is, in there we can do a PushIfNeeded to avoid copying it over and over
again..)

+        <copy todir="${out.dir}/libs/${target.abi}">
+          <path refid="native.libs.gdbserver"/>
+        </copy>
+      </then>
+    </if>
+  </target>
+
   <import file="${sdk.dir}/tools/ant/build.xml" />
 
 </project>