summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authoryongsheng.zhu@intel.com <yongsheng.zhu@intel.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-30 13:05:02 +0000
committeryongsheng.zhu@intel.com <yongsheng.zhu@intel.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-30 13:05:02 +0000
commitcd1177991859a25f39dc70502ad68dae82e9ec8e (patch)
treef01e3783d61cf11da102a77b4b23c67cfd0c926f /content
parentea132fca73cdcc1e0f48e9444b2a84c9f0981b07 (diff)
downloadchromium_src-cd1177991859a25f39dc70502ad68dae82e9ec8e.zip
chromium_src-cd1177991859a25f39dc70502ad68dae82e9ec8e.tar.gz
chromium_src-cd1177991859a25f39dc70502ad68dae82e9ec8e.tar.bz2
Check variable PRODUCT_DIR firstly for content shell test
Simple fix like other build files BUG= TEST= Review URL: https://chromiumcodereview.appspot.com/10825033 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148942 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/shell/android/javatests/content_shell_test_apk.xml19
1 files changed, 7 insertions, 12 deletions
diff --git a/content/shell/android/javatests/content_shell_test_apk.xml b/content/shell/android/javatests/content_shell_test_apk.xml
index 4618529..ba8ba490 100644
--- a/content/shell/android/javatests/content_shell_test_apk.xml
+++ b/content/shell/android/javatests/content_shell_test_apk.xml
@@ -34,18 +34,13 @@
<!-- We expect PRODUCT_DIR to be set like the gyp var
(e.g. $ROOT/out/Debug) -->
- <!-- TODO(satish): 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>
<target name="-post-compile">
<!-- copy gdbserver to main libs directory if building debug.