diff options
| author | yongsheng.zhu@intel.com <yongsheng.zhu@intel.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-13 09:21:16 +0000 |
|---|---|---|
| committer | yongsheng.zhu@intel.com <yongsheng.zhu@intel.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-13 09:21:16 +0000 |
| commit | 78c7bfacaf07ffee728ba461a4e64bef25820212 (patch) | |
| tree | ea35df64d7a4e2fa466c14762095ce32a9fd9b89 /testing | |
| parent | 2ec5bf33c1827240f79ae58d9739465a4168b179 (diff) | |
| download | chromium_src-78c7bfacaf07ffee728ba461a4e64bef25820212.zip chromium_src-78c7bfacaf07ffee728ba461a4e64bef25820212.tar.gz chromium_src-78c7bfacaf07ffee728ba461a4e64bef25820212.tar.bz2 | |
Do check variable PRODUCT_DIR before any ant targets
Use fail and condition to do check firstly before any targets
BUG=
TEST=
Review URL: https://chromiumcodereview.appspot.com/10696189
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@146540 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/android/native_test_apk.xml | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/testing/android/native_test_apk.xml b/testing/android/native_test_apk.xml index 8fd05bb..444cf93 100644 --- a/testing/android/native_test_apk.xml +++ b/testing/android/native_test_apk.xml @@ -32,18 +32,13 @@ found in the LICENSE file. <!-- We expect PRODUCT_DIR to be set like the gyp var (e.g. $ROOT/out/Debug) --> - <!-- TODO(jrg): ideally we need this to run before -build-setup, where - directories are made based on this variable. --> - <target name="-pre-build"> - <if> - <condition> - <isset property="PRODUCT_DIR" /> - </condition> - <else> - <fail message="PRODUCT_DIR env var not set?" /> - </else> - </if> - </target> + <fail message="PRODUCT_DIR env var not set?"> + <condition> + <not> + <isset property="PRODUCT_DIR"/> + </not> + </condition> + </fail> <property name="out.dir" location="${PRODUCT_DIR}/replaceme_apk"/> |