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

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: Created 8 years, 5 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
Index: content/public/android/java/content.xml
diff --git a/content/public/android/java/content.xml b/content/public/android/java/content.xml
index 2302b1fdc99ad95be829c0d5793c6ef43413659f..cb938f438255bedc80a7494057b15f171ace3b0b 100644
--- a/content/public/android/java/content.xml
+++ b/content/public/android/java/content.xml
@@ -7,57 +7,13 @@
<description>
building content java source code with ant
</description>
- <!-- set global properties for this build -->
- <property environment="env"/>
- <property name="sdk.dir" location="${env.ANDROID_SDK_ROOT}"/>
- <property name="sdk.version" value="${env.ANDROID_SDK_VERSION}"/>
- <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}"/>
-
- <condition property="location.base"
- value="${sdk.dir}"
- else="${sdk.dir}/platforms/android-${sdk.version}">
- <isset property="env.ANDROID_BUILD_TOP"/>
- </condition>
-
- <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="${location.base}/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>
-
- <target name="clean" description="clean up" >
- <!-- Delete the generated content -->
- <delete dir="${classes.dir}"/>
- <delete file="${jar.dir}/chromium_${PACKAGE_NAME}.jar"/>
- </target>
+ <import file="../../../../build/android/ant/chromium-jars.xml" />
+
+ <path id="javac.custom.classpath">
+ <pathelement location="${location.base}/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>

Powered by Google App Engine
This is Rietveld 408576698