Android: remove ant environment dependencies.

content/public/android/javatests/content_javatests.xml

Index: content/public/android/javatests/content_javatests.xml
diff --git a/content/public/android/javatests/content_javatests.xml b/content/public/android/javatests/content_javatests.xml
index a46511881cd36a934884d9dc35a7212831c8e67f..73d05d8e095c72bb46265685c6abfbe8a364bd2b 100644
--- a/content/public/android/javatests/content_javatests.xml
+++ b/content/public/android/javatests/content_javatests.xml
@@ -8,20 +8,11 @@
     building content-only instrumentation tests 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="out.dir" location="${PRODUCT_DIR}/lib.java"/>
   <property name="classes.dir" location="${PRODUCT_DIR}/java/${PACKAGE_NAME}"/>
   <property name="jar.dir" location="${out.dir}"/>
 
-  <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/>
@@ -39,7 +30,7 @@
          lib.jar (see content.gyp:common_aidl). -->
     <javac srcdir="${src}" destdir="${classes.dir}" debug="true" includeantruntime="false">
       <classpath>
-        <pathelement path="${location.base}/android.jar" />
+        <pathelement path="${ANDROID_SDK}/android.jar" />
         <pathelement path="${jar.dir}/chromium_base.jar" />
         <pathelement path="${jar.dir}/chromium_base_javatests.jar" />
         <pathelement path="${jar.dir}/chromium_content.jar" />