Android: remove ant environment dependencies.

base/android/java/base.xml

Index: base/android/java/base.xml
diff --git a/base/android/java/base.xml b/base/android/java/base.xml
index 74589b467ec9a5ece21cc0d3784c5dd0618dc781..869834181e345548cee86a35ffd19778f4e11e89 100644
--- a/base/android/java/base.xml
+++ b/base/android/java/base.xml
@@ -3,11 +3,6 @@
     building base java 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"/>
 
-  <!-- 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>