fix android libretro build

Author: Zer0xFF

.travis.sh

@@ -37,8 +37,11 @@ travis_script()
 {
     if [ "$TARGET_OS" = "Android" ]; then
         if [ "$BUILD_LIBRETRO" = "yes" ]; then
-            export PATH=/opt/cmake-3.8.1-Linux-x86_64/bin/:$PATH
-            export ANDROID_NDK=/usr/local/android-sdk/ndk-bundle
+            CMAKE_PATH=/usr/local/android-sdk/cmake/3.10.2.4988404
+            export PATH=${CMAKE_PATH}/bin:$PATH
+            export NINJA_EXE=${CMAKE_PATH}/bin/ninja
+            export ANDROID_NDK=/usr/local/android-sdk/ndk/20.0.5594570
+            export ANDROID_TOOLCHAIN_FILE=${ANDROID_NDK}/build/cmake/android.toolchain.cmake
             pushd build_retro
             bash android_build.sh
             popd

build_retro/android_build.sh

@@ -17,12 +17,13 @@ do
 	-DANDROID_ABI="${ABI}" \
 	-DANDROID_NDK=${ANDROID_NDK} \
 	-DCMAKE_BUILD_TYPE=Release \
-	-DCMAKE_TOOLCHAIN_FILE=${ANDROID_NDK}/build/cmake/android.toolchain.cmake \
+	-DCMAKE_TOOLCHAIN_FILE=${ANDROID_TOOLCHAIN_FILE} \
 	-DANDROID_NATIVE_API_LEVEL=19 \
 	-DANDROID_STL=c++_static \
-	-DANDROID_TOOLCHAIN=clang
+	-DANDROID_TOOLCHAIN=clang \
+	-DCMAKE_MAKE_PROGRAM=${NINJA_EXE}
 
 	cmake --build . --target play_libretro
-	${STRIP} -strip-all Source/ui_libretro/play_libretro_android.so ../play_libretro_${ABI}_android.so
+	${STRIP} -strip-all -o ../play_libretro_${ABI}_android.so Source/ui_libretro/play_libretro_android.so
 	popd
 done