diff options
| author | torne@chromium.org <torne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-01 11:31:47 +0000 |
|---|---|---|
| committer | torne@chromium.org <torne@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-01 11:31:47 +0000 |
| commit | 75b558c7c2b7927191c1326701f0c4f09ade385b (patch) | |
| tree | 0ab08f37c6d9c9097056dcfb0e6ed28ee775afb3 /media | |
| parent | edaf596da7f67917f53891fabbeffad00db5f843 (diff) | |
| download | chromium_src-75b558c7c2b7927191c1326701f0c4f09ade385b.zip chromium_src-75b558c7c2b7927191c1326701f0c4f09ade385b.tar.gz chromium_src-75b558c7c2b7927191c1326701f0c4f09ade385b.tar.bz2 | |
Android: remove ant environment dependencies.
The logic to calculate where the SDK should be is already done by
envsetup and made available to gyp as a variable, so just have gyp pass
this as a command line argument to ant. The behaviour is identical.
This change is to move toward making it possible to build the Android
port without having envsetup.sh sourced at build time (only at
gyp-generation time), making it more like other platforms. It also
simplifies the ant buildfiles.
Review URL: https://chromiumcodereview.appspot.com/10821105
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149400 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
| -rw-r--r-- | media/base/android/java/media.xml | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/media/base/android/java/media.xml b/media/base/android/java/media.xml index a62291b..2dbec23 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> |