Revert ANDROID_HOME

Author: rubengees

circle.yml

@@ -2,23 +2,22 @@ machine:
   java:
     version: openjdk8
   environment:
-    ANDROID_HOME: /usr/local/android-sdk-linux
     GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError"'
 
 dependencies:
   cache_directories:
-    - $ANDROID_HOME/extras/android/m2repository
-    - $ANDROID_HOME/extras/google/m2repository
-    - $ANDROID_HOME/platforms/android-25
-    - $ANDROID_HOME/build-tools/25.0.0
-    - $ANDROID_HOME/platform-tools
+    - /usr/local/android-sdk-linux/extras/android/m2repository
+    - /usr/local/android-sdk-linux/extras/google/m2repository
+    - /usr/local/android-sdk-linux/platforms/android-25
+    - /usr/local/android-sdk-linux/build-tools/25.0.0
+    - /usr/local/android-sdk-linux/platform-tools
   pre:
-    - cp -r ./licenses $ANDROID_HOME
-    - if [ $(grep -q "Revision=39.0.0" $ANDROID_HOME/extras/android/m2repository/source.properties) ] ; then echo y | android update sdk --no-ui --all --filter "extra-android-m2repository" ; fi
-    - if [ $(grep -q "Revision=38" $ANDROID_HOME/extras/google/m2repository/source.properties) ] ; then echo y | android update sdk --no-ui --all --filter "extra-google-m2repository" ; fi
-    - if [ ! -e $ANDROID_HOME/platforms/android-25 ] ; then echo y | android update sdk --no-ui --all --filter "android-25" ; fi
-    - if [ ! -e $ANDROID_HOME/build-tools/25.0.0 ] ; then echo y | android update sdk --no-ui --all --filter "build-tools-25.0.0" ; fi
-    - if [ $(grep -q "Revision=25.0.0" $ANDROID_HOME/platform-tools/source.properties) ] ; then echo y | android update sdk --no-ui --all --filter "platform-tools" ; fi
+    - cp -r ./licenses /usr/local/android-sdk-linux
+    - if [ $(grep -q "Revision=39.0.0" /usr/local/android-sdk-linux/extras/android/m2repository/source.properties) ] ; then echo y | android update sdk --no-ui --all --filter "extra-android-m2repository" ; fi
+    - if [ $(grep -q "Revision=38" /usr/local/android-sdk-linux/extras/google/m2repository/source.properties) ] ; then echo y | android update sdk --no-ui --all --filter "extra-google-m2repository" ; fi
+    - if [ ! -e /usr/local/android-sdk-linux/platforms/android-25 ] ; then echo y | android update sdk --no-ui --all --filter "android-25" ; fi
+    - if [ ! -e /usr/local/android-sdk-linux/build-tools/25.0.0 ] ; then echo y | android update sdk --no-ui --all --filter "build-tools-25.0.0" ; fi
+    - if [ $(grep -q "Revision=25.0.0" /usr/local/android-sdk-linux/platform-tools/source.properties) ] ; then echo y | android update sdk --no-ui --all --filter "platform-tools" ; fi
   override:
     - ./gradlew dependencies -Dorg.gradle.daemon=false --console=plain