Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2132)

Unified Diff: content/public/android/java/content.xml

Issue 10830012: [Android] Add chrome_java target for building Java code in the chromium layer. (Closed) Base URL: http://git.chromium.org/chromium/src.git@reland
Patch Set: fix java build error Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/content_tests.gypi ('k') | content/shell/android/java/content_shell_apk.xml » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/public/android/java/content.xml
diff --git a/content/public/android/java/content.xml b/content/public/android/java/content.xml
index 7e4cd98dba673270d89427003a7769abd6fd8b77..1a6bd52b8b5c48701917836a32b8f42948c9af92 100644
--- a/content/public/android/java/content.xml
+++ b/content/public/android/java/content.xml
@@ -1,54 +1,19 @@
-<!-- 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.
+<!--
+ 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="Content" default="dist" basedir=".">
<description>
building content java source code with ant
</description>
- <!-- set global properties for this build -->
- <property name="src" location="src"/>
- <property name="out.dir" location="${PRODUCT_DIR}/lib.java"/>
- <property name="classes.dir" location="${PRODUCT_DIR}/java/${PACKAGE_NAME}"/>
- <property name="jar.dir" location="${out.dir}"/>
-
- <target name="init">
- <!-- Create the time stamp -->
- <tstamp/>
- <!-- Create the build directory structure used by compile -->
- <mkdir dir="${out.dir}"/>
- </target>
-
- <target name="compile" depends="init"
- description="compile the source " >
- <!-- Create the classes output directory -->
- <mkdir dir="${classes.dir}"/>
-
- <!-- Compile the java code from ${src} into ${classes.dir} -->
- <!-- Gyp target should have compiled aidl files into java source files in
- lib.jar (see content.gyp:common_aidl). -->
- <javac srcdir="${src}:${out.dir}" destdir="${classes.dir}" debug="true" includeantruntime="false">
- <classpath>
- <pathelement path="${ANDROID_SDK}/android.jar" />
- <pathelement path="${jar.dir}/chromium_base.jar" />
- <pathelement path="${jar.dir}/chromium_net.jar" />
- </classpath>
- </javac>
- </target>
-
- <target name="dist" depends="compile"
- description="generate the distribution" >
- <!-- Create the distribution directory -->
- <mkdir dir="${jar.dir}"/>
-
- <!-- Put everything in ${classes.dir} into the chromium_content.jar file -->
- <jar jarfile="${jar.dir}/chromium_${PACKAGE_NAME}.jar" basedir="${classes.dir}"/>
- </target>
+ <import file="../../../../build/android/ant/chromium-jars.xml" />
- <target name="clean" description="clean up" >
- <!-- Delete the generated content -->
- <delete dir="${classes.dir}"/>
- <delete file="${jar.dir}/chromium_${PACKAGE_NAME}.jar"/>
- </target>
+ <path id="javac.custom.classpath">
+ <pathelement location="${ANDROID_SDK}/android.jar" />
+ <pathelement location="${lib.dir}/chromium_base.jar" />
+ <pathelement location="${lib.dir}/chromium_net.jar" />
+ </path>
+ <!-- Override javac path to include jars in lib.java directory -->
+ <property-value name="javac.srcdir" value="${src}:${lib.dir}" />
</project>
« no previous file with comments | « content/content_tests.gypi ('k') | content/shell/android/java/content_shell_apk.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698