Android: remove ant environment dependencies.

base/android/javatests/base_javatests.xml

Index: base/android/javatests/base_javatests.xml
diff --git a/base/android/javatests/base_javatests.xml b/base/android/javatests/base_javatests.xml
index d4aa0812111eb222df9635d1848e06689f849913..ba16358df7f0c2151806e852cae9cb5b4ef29ec1 100644
--- a/base/android/javatests/base_javatests.xml
+++ b/base/android/javatests/base_javatests.xml
@@ -3,11 +3,6 @@
     building base java tests source code with ant
   </description>
   <!-- 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="src"/>
   <property name="dist" location="dist"/>
   <property name="out.dir" location="${PRODUCT_DIR}/lib.java"/>
@@ -16,15 +11,6 @@
        like this are androidified -->
   <property name="dest.dir" location="${PRODUCT_DIR}/java/base_javatests"/>
 
-  <!-- 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/>
@@ -44,7 +30,7 @@
       -->
     <javac srcdir="${src}" destdir="${dest.dir}" debug="true" includeantruntime="false">
       <classpath>
-        <path location="${location.base}/android.jar"/>
+        <path location="${ANDROID_SDK}/android.jar"/>
       </classpath>
     </javac>
   </target>