Index: content/shell/android/java/content_shell_apk.xml |
diff --git a/content/shell/android/java/content_shell_apk.xml b/content/shell/android/java/content_shell_apk.xml |
index 2b476119f7478f4b7adfaaa112e2fa8b6cf9a619..7d22022d247e5a54472c2b1e89f8d88c53219dff 100644 |
--- a/content/shell/android/java/content_shell_apk.xml |
+++ b/content/shell/android/java/content_shell_apk.xml |
@@ -9,29 +9,27 @@ |
<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="source.dir" location="src"/> |
- <property name="target" value="android-${env.ANDROID_SDK_VERSION}"/> |
- <property name="target.abi" value="${APP_ABI}"/> |
- <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"/> |
+ <import file="../../../../build/android/ant/common.xml" /> |
+ <import file="../../../../build/android/ant/sdk-targets.xml" /> |
+ <property-value name="target.abi" value="${APP_ABI}" /> |
+ <property-location name="out.dir" location="${PRODUCT_DIR}/content_shell" |
+ check-exists="false" /> |
+ <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"/> |
+ <fileset file="${toolchain.dir}/../../gdbserver" /> |
</path> |
<property name="native.libs.absolute.dir" location="${out.dir}/libs" /> |
<property name="asset.absolute.dir" location="${out.dir}/assets" /> |
<path id="out.dex.jar.input.ref"> |
- <fileset file="${out.dir}/java/libs/chromium_content.jar"/> |
- <fileset file="${out.dir}/java/libs/chromium_net.jar"/> |
- <fileset file="${out.dir}/java/libs/chromium_base.jar"/> |
- <fileset file="${out.dir}/java/libs/chromium_media.jar"/> |
+ <fileset file="${out.dir}/java/libs/chromium_content.jar" /> |
+ <fileset file="${out.dir}/java/libs/chromium_net.jar" /> |
+ <fileset file="${out.dir}/java/libs/chromium_base.jar" /> |
+ <fileset file="${out.dir}/java/libs/chromium_media.jar" /> |
</path> |
- <property name="java.compilerargs" value="-classpath ${toString:out.dex.jar.input.ref}"/> |
+ <property name="java.compilerargs" value="-classpath ${toString:out.dex.jar.input.ref}" /> |
<!-- We expect PRODUCT_DIR to be set like the gyp var |
(e.g. $ROOT/out/Debug) --> |
@@ -54,14 +52,18 @@ |
<equals arg1="${build.target}" arg2="debug" /> |
</condition> |
<then> |
- <echo message="Copying gdbserver to the apk to enable native debugging"/> |
+ <echo message="Copying gdbserver to the apk to enable native debugging" /> |
<copy todir="${out.dir}/libs/${target.abi}"> |
- <path refid="native.libs.gdbserver"/> |
+ <path refid="native.libs.gdbserver" /> |
</copy> |
</then> |
</if> |
</target> |
- <import file="${sdk.dir}/tools/ant/build.xml" /> |
+<!-- Classpath for javac --> |
+ <path id="javac.custom.classpath"> |
+ <path refid="out.dex.jar.input.ref" /> |
+ </path> |
+ <import file="${sdk.dir}/tools/ant/build.xml" /> |
</project> |