Chromium Code Reviews| 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 61a6f6e38f7d9b29f90ade0da4588b16a1ce41fa..3e89773b1e7361509a22aed6759191ca9c0a88be 100644 |
| --- a/content/shell/android/content_shell_apk.xml |
| +++ b/content/shell/android/content_shell_apk.xml |
| @@ -12,8 +12,17 @@ |
| <property environment="env"/> |
| <property name="sdk.dir" location="${env.ANDROID_SDK_ROOT}"/> |
| + <property name="toolchain.dir" location="${env.ANDROID_TOOLCHAIN}"/> |
| <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"/> |
|
Satish
2012/05/03 10:28:03
should this be "${out.dir}/res" as well since the
|
| + <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" /> |
| <!-- We expect PRODUCT_DIR to be set like the gyp var |
| (e.g. $ROOT/out/Debug) --> |
| @@ -29,13 +38,25 @@ |
| </else> |
| </if> |
| </target> |
| - |
| - <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"/> |
| - <property name="native.libs.absolute.dir" location="${out.dir}/libs" /> |
| + |
| + <target name="-post-compile"> |
| + <!-- copy gdbserver to main libs directory if building debug. |
| + 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> |
| + </then> |
| + </if> |
| + </target> |
| <import file="${sdk.dir}/tools/ant/build.xml" /> |