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

Unified Diff: media/base/android/java/media.xml

Issue 10377059: Android content shell bringup. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 7 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: media/base/android/java/media.xml
diff --git a/media/base/android/java/media.xml b/media/base/android/java/media.xml
index 28a8ef1ca336573b7059f44d89ed6b251753b25a..90314b9d825d98c38fc28b050cb4a20ff48bd5e9 100644
--- a/media/base/android/java/media.xml
+++ b/media/base/android/java/media.xml
@@ -14,6 +14,8 @@
<property name="src" location="."/>
<property name="build" location="build"/>
<property name="dist" location="dist"/>
+ <property name="out.dir" location="${PRODUCT_DIR}/lib.java"/>
+ <property name="jar.dir" location="${out.dir}"/>
Yaron 2012/05/09 01:01:42 jar.dir is redundant since we have out.dir. It's k
John Grabowski 2012/05/09 17:18:15 Problem was I'm trying to be more consistent with
<condition property="location.base"
value="${sdk.dir}"
@@ -25,15 +27,17 @@
<!-- Create the time stamp -->
<tstamp/>
<!-- Create the build directory structure used by compile -->
- <mkdir dir="${build}"/>
+ <mkdir dir="${out.dir}"/>
+ <mkdir dir="${dest.dir}"/>
Yaron 2012/05/09 01:01:42 I don't see dest.dir specified as a property. Can
</target>
<target name="compile" depends="init"
description="compile the source " >
<!-- Compile the java code from ${src} into ${build} -->
Yaron 2012/05/09 01:01:42 Comment shoudl be "... into ${classes.dir}"
- <javac srcdir="${src}" destdir="${build}">
+ <javac srcdir="${src}" destdir="${dest.dir}">
<classpath>
- <path location="${location.base}/android.jar"/>
+ <pathelement path="${location.base}/android.jar" />
+ <pathelement path="${jar.dir}/chromium_base.jar" />
</classpath>
</javac>
</target>
@@ -44,13 +48,13 @@
<mkdir dir="${dist}/lib"/>
<!-- Put everything in ${build} into the chromium_media.jar file -->
- <jar jarfile="${dist}/lib/chromium_media.jar" basedir="${build}"/>
+ <jar jarfile="${out.dir}/chromium_media.jar" basedir="${dest.dir}"/>
</target>
<target name="clean"
description="clean up" >
- <!-- Delete the ${build} and ${dist} directory trees -->
- <delete dir="${build}"/>
+ <!-- Delete the appropriate directory trees -->
+ <delete dir="${dest.dir}"/>
<delete dir="${dist}"/>
</target>
</project>

Powered by Google App Engine
This is Rietveld 408576698