diff options
| author | shouqun.liu@intel.com <shouqun.liu@intel.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-06 17:49:51 +0000 |
|---|---|---|
| committer | shouqun.liu@intel.com <shouqun.liu@intel.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-06 17:49:51 +0000 |
| commit | a0693be1c0586d46c2841395ddab443b93e64731 (patch) | |
| tree | 5606c8b7653bb9b3295f3b89d3d03799a37f34f5 /testing | |
| parent | 927e4bfeafbcdd51948e9adcc8e96599e7e170d8 (diff) | |
| download | chromium_src-a0693be1c0586d46c2841395ddab443b93e64731.zip chromium_src-a0693be1c0586d46c2841395ddab443b93e64731.tar.gz chromium_src-a0693be1c0586d46c2841395ddab443b93e64731.tar.bz2 | |
Copying gdbserver to the apk to enable native debugging for native_test_apk
BUG=
TEST=
Review URL: https://chromiumcodereview.appspot.com/10689102
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@145603 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'testing')
| -rwxr-xr-x | testing/android/generate_native_test.py | 1 | ||||
| -rw-r--r-- | testing/android/native_test_apk.xml | 20 |
2 files changed, 21 insertions, 0 deletions
diff --git a/testing/android/generate_native_test.py b/testing/android/generate_native_test.py index 6a6173d..79f21d0 100755 --- a/testing/android/generate_native_test.py +++ b/testing/android/generate_native_test.py @@ -145,6 +145,7 @@ class NativeTestApkGenerator(object): cmd = ['ant'] if ant_args: cmd.append(ant_args) + cmd.append("-DAPP_ABI=" + self._target_abi) cmd.extend(['-buildfile', os.path.join(self._output_directory, 'native_test_apk.xml')]) logging.warn(cmd) diff --git a/testing/android/native_test_apk.xml b/testing/android/native_test_apk.xml index fe2db25..fff7671 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"/> + <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> |