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

content/shell/android/java/content_shell_apk.xml

@@ -35,18 +35,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.

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"/>