Browse Source

try fix travis

Daniel Zlotin 8 years ago
parent
commit
ede1840f55
1 changed files with 11 additions and 17 deletions
  1. 11
    17
      scripts/env/installAndroidSDK.sh

+ 11
- 17
scripts/env/installAndroidSDK.sh View File

@@ -1,22 +1,16 @@
1 1
 #!/bin/bash -e
2 2
 
3
-# export ANDROID_HOME=$HOME/android-sdk-macosx
4
-# export PATH=$PATH:$ANDROID_HOME/tools:$ANDROID_HOME/platform-tools
3
+export ANDROID_HOME=$HOME/android-sdk-macosx
4
+export PATH=$PATH:$ANDROID_HOME/tools:$ANDROID_HOME/platform-tools
5 5
 
6
-# # fix for https://code.google.com/p/android/issues/detail?id=223424
7
-# mkdir -p ~/.android
6
+# fix for https://code.google.com/p/android/issues/detail?id=223424
7
+mkdir -p ~/.android
8 8
 
9
-# # download android SDK
10
-# echo "Downloading Android SDK"
11
-# curl --location https://dl.google.com/android/android-sdk_r24.4.1-macosx.zip | tar -x -z -C $HOME
9
+# download android SDK
10
+echo "Downloading Android SDK"
11
+curl --location https://dl.google.com/android/android-sdk_r24.4.1-macosx.zip | tar -x -z -C $HOME
12 12
 
13
-# # copy licenses
14
-# echo "Copying Android licenses"
15
-# scriptdir=`dirname $0`
16
-# mkdir -p "${ANDROID_HOME}"/licenses
17
-# cp "${scriptdir}"/android-sdk-licenses/* "${ANDROID_HOME}"/licenses
18
-
19
-# SCRIPT=`realpath $0`
20
-SCRIPTPATH=`dirname $0`
21
-
22
-echo $SCRIPTPATH
13
+# copy licenses
14
+echo "Copying Android licenses"
15
+mkdir -p "${ANDROID_HOME}"/licenses
16
+cp "./android-sdk-licenses/*" "${ANDROID_HOME}"/licenses