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

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

Issue 10821105: Android: remove ant environment dependencies. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
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
« no previous file with comments | « content/public/android/javatests/content_javatests.xml ('k') | net/android/java/net.xml » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/android/java/media.xml
diff --git a/media/base/android/java/media.xml b/media/base/android/java/media.xml
index a62291b9ed3e1637baa98e045a39e39a597da521..2dbec23def868b99d4a358eb9665aa848785af1f 100644
--- a/media/base/android/java/media.xml
+++ b/media/base/android/java/media.xml
@@ -8,21 +8,12 @@
building media 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="build" location="build"/>
<property name="dist" location="dist"/>
<property name="out.dir" location="${PRODUCT_DIR}/lib.java"/>
<property name="dest.dir" location="${PRODUCT_DIR}/java/media"/>
- <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/>
@@ -36,7 +27,7 @@
<!-- Compile the java code from ${src} into ${dest.dir} -->
<javac srcdir="${src}" destdir="${dest.dir}" debug="true" includeantruntime="false">
<classpath>
- <pathelement path="${location.base}/android.jar" />
+ <pathelement path="${ANDROID_SDK}/android.jar" />
<pathelement path="${out.dir}/chromium_base.jar" />
</classpath>
</javac>
« no previous file with comments | « content/public/android/javatests/content_javatests.xml ('k') | net/android/java/net.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698