Use built in android SDK in travis remove ANDROID_SDK variable

Shervanator · Shervanator · commit 817b99846c70 · 2016-07-30T17:20:31.000+10:00
diff --git a/.travis.yml b/.travis.yml
@@ -6,17 +6,17 @@ sudo: false
 
 language:
   - cpp
-  # - android
+  - android
 
 jdk:
-  - oraclejdk7
+  - oraclejdk8
 
 android:
   components:
-    # - build-tools-20.0.0
+    - build-tools-24.0.1
 
     # The SDK version used to compile your project
-    # - android-22
+    - android-22
 
     # Additional components
     # - extra-google-google_play_services
@@ -40,34 +40,22 @@ addons:
     - g++-4.8
     - clang
 
-
 before_script:
   - "if [ $TRAVIS_OS_NAME == osx ]; then \
         brew update;
-        brew install android-sdk android-ndk ant;
-        export ANDROID_SDK=/usr/local/opt/android-sdk;
+        brew install android-ndk ant;
         export ANDROID_NDK=/usr/local/opt/android-ndk;
-        export PATH=${PATH}:${ANDROID_SDK}/tools:${ANDROID_SDK}/platform-tools:${ANDROID_NDK};
+        export PATH=${PATH}:${ANDROID_NDK};
     fi"
   - "if [ $TRAVIS_OS_NAME == linux ]; then \
         wget --quiet --continue http://dl.google.com/android/repository/android-ndk-r12b-linux-x86_64.zip -O ndk.zip;
         unzip -o -q ndk.zip;
-
-        wget --quiet --continue http://dl.google.com/android/android-sdk_r24.4.1-linux.tgz;
-        tar -xzf android-sdk_r24.4.1-linux.tgz;
-        echo \"y\" | ./android-sdk-linux/tools/android update sdk -a -u -s -t platform-tools,build-tools-24.0.1,android-22;
-        export ANDROID_SDK=`pwd`/android-sdk-linux;
-        export ANDROID_HOME=$ANDROID_SDK;
         export ANDROID_NDK=`pwd`/android-ndk-r12b;
-        export PATH=${PATH}:${ANDROID_SDK}/tools:${ANDROID_SDK}/platform-tools:${ANDROID_NDK};
+        export PATH=${PATH}:${ANDROID_NDK};
     fi"
 
 script:
   - cmake --version
   - echo $ANDROID_NDK
   - ANDROID_NDK=$ANDROID_NDK ./scripts/cmake-android.sh -j4
   - ./scripts/cmake-make.sh -j4
-
-notifications:
-  email:
-    - shervinaflatooni@gmail.com
diff --git a/cmake/android.cmake b/cmake/android.cmake
@@ -1,18 +1,4 @@
-# Adapted from https://github.com/mgerhardy/caveexpress/blob/master/cmake/android.cmake
-
-set(MIN_ANDROID_SDK 10)
-set(TARGET_ANDROID_SDK 22)
-
 set(ANDROID_NDK_ROOT ${ANDROID_NDK})
-set(ANDROID_SDK_ROOT $ENV{ANDROID_SDK})
-set(ANDROID_SDK_BUILD_TOOLS_VERSION "24.0.1")
-set(ANDROID_BUILD_TOOLS_ROOT ${ANDROID_SDK_ROOT}/build-tools/${ANDROID_SDK_BUILD_TOOLS_VERSION})
-set(ANDROID_API "android-22" CACHE STRING "Android platform version")
-
-if (${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Windows")
-	set(ANDROID_NDK_EXE_EXT ".exe")
-	set(ANDROID_SDK_TOOL_EXT ".bat")
-endif()
 
 if (VERBOSE)
 	set(ANT_FLAGS -v)
@@ -24,16 +10,10 @@ if (GRADLE)
 	set(ANDROID_TOOL_FLAGS "${ANDROID_TOOL_FLAGS} -g")
 endif()
 
-set(ANDROID_SDK_TOOL "${ANDROID_SDK_ROOT}/tools/android${ANDROID_SDK_TOOL_EXT}")
-
 if (NOT ANDROID_NDK_ROOT)
 	message(FATAL_ERROR "ANDROID_NDK environment variable is not set")
 endif()
-if (NOT ANDROID_SDK_ROOT)
-	message(FATAL_ERROR "ANDROID_SDK environment variable is not set")
-endif()
 message(STATUS "Android NDK root: ${ANDROID_NDK_ROOT}")
-message(STATUS "Android SDK root: ${ANDROID_SDK_ROOT}")
 
 if (RELEASE)
 	set(ANT_TARGET release)
@@ -64,15 +44,8 @@ endif()
 
 find_host_program(JARSIGNER "jarsigner")
 find_host_program(ANDROID_NDK_STACK "ndk-stack" HINTS ${ANDROID_NDK_ROOT})
-find_host_program(ANDROID_ZIPALIGN "zipalign" HINTS ${ANDROID_SDK_ROOT}/tools)
-if (ANDROID_ZIPALIGN)
-	message(STATUS "zipalign tool found")
-else()
-	set(ANDROID_ZIPALIGN ${ANDROID_BUILD_TOOLS_ROOT}/zipalign)
-	message(STATUS "could not find zipalign in path - use ${ANDROID_ZIPALIGN}")
-endif()
 
-find_host_program(ANDROID_ADB adb PATHS ${ANDROID_SDK_ROOT}/platform-tools/)
+find_host_program(ANDROID_ADB adb)
 if (ANDROID_ADB)
 	message(STATUS "adb tool found")
 else()
diff --git a/scripts/cmake-android.sh b/scripts/cmake-android.sh
@@ -6,11 +6,11 @@ BUILD_TYPE=${BUILD_TYPE:-Release}
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 mkdir -p $DIR/../bin-android
 cd $DIR/../bin-android
-cmake .. -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DANDROID_NDK=$ANDROID_NDK -DANDROID_NATIVE_API_LEVEL=17 -DANDROID_TOOLCHAIN_NAME=arm-linux-androideabi-4.9 -DCMAKE_TOOLCHAIN_FILE=$DIR/../cmake/toolchains/android.toolchain.cmake
+cmake .. -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DANDROID_NDK=$ANDROID_NDK -DANDROID_NATIVE_API_LEVEL=22 -DANDROID_TOOLCHAIN_NAME=arm-linux-androideabi-4.9 -DCMAKE_TOOLCHAIN_FILE=$DIR/../cmake/toolchains/android.toolchain.cmake
 make $*
 make android-build
 
-STATE=$(${ANDROID_SDK}/platform-tools/adb get-state || exit 0)
+STATE=$(adb get-state || exit 0)
 if [ "$STATE" == "device" ]; then
 	make android-install android-start
 fi
