diff options
| author | yfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-29 16:48:34 +0000 |
|---|---|---|
| committer | yfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-29 16:48:34 +0000 |
| commit | 5b86233e318b972f290e45f4de8ea3f42cd890db (patch) | |
| tree | 3a04233698de1b3bbca33f2bfa4ee1c770e45d57 /base | |
| parent | 01e7093f7907daf5beb82533ed4165829540ba08 (diff) | |
| download | chromium_src-5b86233e318b972f290e45f4de8ea3f42cd890db.zip chromium_src-5b86233e318b972f290e45f4de8ea3f42cd890db.tar.gz chromium_src-5b86233e318b972f290e45f4de8ea3f42cd890db.tar.bz2 | |
Update Ant build to support multiple build configurations.
Enables building both upstream in chromium and in the downstream fork.
Review URL: https://chromiumcodereview.appspot.com/9837099
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@129633 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
| -rw-r--r-- | base/android/java/base.xml | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/base/android/java/base.xml b/base/android/java/base.xml index 87cd72b..36afff4 100644 --- a/base/android/java/base.xml +++ b/base/android/java/base.xml @@ -5,11 +5,22 @@ <!-- Set global properties for this build --> <property environment="env"/> <property name="sdk.dir" location="${env.ANDROID_SDK_ROOT}"/> + <!-- TODO(jrg): The apk-runner's version is hardcoded to SDK version 14. These + two should be unified. --> <property name="sdk.version" value="${env.ANDROID_SDK_VERSION}"/> <property name="src" location="."/> <property name="build" location="build"/> <property name="dist" location="dist"/> + <!-- Set path depending on the type of repository. If ANDROID_BUILD_TOP is + set then build using the provided location. Otherwise, assume the build + is using the released SDK and set the path accordingly. --> + <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/> @@ -22,7 +33,7 @@ <!-- Compile the java code from ${src} into ${build} --> <javac srcdir="${src}" destdir="${build}"> <classpath> - <path location="${sdk.dir}/platforms/android-${sdk.version}/android.jar"/> + <path location="${location.base}/android.jar"/> </classpath> </javac> </target> |