diff --git a/.travis.sh b/.travis.sh index c944daf15f..c1fce361fb 100644 --- a/.travis.sh +++ b/.travis.sh @@ -83,9 +83,13 @@ travis_script() { export NDK_TOOLCHAIN_VERSION=clang fi - pushd android - ./ab.sh -j2 APP_ABI=$APP_ABI - popd + if [ "$LIBRETRO" = "TRUE" ]; then + ./b.sh --libretro_android ppsspp_libretro + else + pushd android + ./ab.sh -j2 APP_ABI=$APP_ABI + popd + fi # When we can get this to work... # chmod +x gradlew diff --git a/.travis.yml b/.travis.yml index da4efe94a4..5ae9a80979 100644 --- a/.travis.yml +++ b/.travis.yml @@ -70,6 +70,11 @@ matrix: compiler: "gcc" env: PPSSPP_BUILD_TYPE=Android APP_ABI=x86_64 + - os: linux + compiler: "gcc" + env: PPSSPP_BUILD_TYPE=Android + APP_ABI=arm64-v8a + LIBRETRO=TRUE - os: linux compiler: "clang" env: PPSSPP_BUILD_TYPE=Linux diff --git a/b.sh b/b.sh index 6873123096..c901e4fadc 100755 --- a/b.sh +++ b/b.sh @@ -41,6 +41,9 @@ do --libretro) echo "Build Libretro core" CMAKE_ARGS="-DLIBRETRO=ON ${CMAKE_ARGS}" ;; + --libretro_android) echo "Build Libretro Android core" + CMAKE_ARGS="-DLIBRETRO=ON -DCMAKE_TOOLCHAIN_FILE=${NDK}/build/cmake/android.toolchain.cmake -DANDROID_ABI=${APP_ABI} ${CMAKE_ARGS}" + ;; --unittest) echo "Build unittest" CMAKE_ARGS="-DUNITTEST=ON ${CMAKE_ARGS}" ;;