From 9c2a9078e0f6a63084df29a80a118dbb370d424b Mon Sep 17 00:00:00 2001 From: Aaron Kling Date: Wed, 11 Apr 2018 09:02:53 -0500 Subject: [PATCH] Update cores-android-cmake to use ndk r16b --- recipes/android/cores-android-cmake-aarch64 | 2 +- recipes/android/cores-android-cmake-aarch64.conf | 7 +++---- recipes/android/cores-android-cmake-armv7 | 2 +- recipes/android/cores-android-cmake-armv7.conf | 7 +++---- recipes/android/cores-android-cmake-x86 | 2 +- recipes/android/cores-android-cmake-x86.conf | 7 +++---- 6 files changed, 12 insertions(+), 15 deletions(-) diff --git a/recipes/android/cores-android-cmake-aarch64 b/recipes/android/cores-android-cmake-aarch64 index da6deda2..61f9a7b5 100644 --- a/recipes/android/cores-android-cmake-aarch64 +++ b/recipes/android/cores-android-cmake-aarch64 @@ -1 +1 @@ -ppsspp libretro-ppsspp-aarch64 https://github.com/hrydgard/ppsspp.git master YES CMAKE Makefile build -DLIBRETRO=ON -DANDROID_TOOLCHAIN=clang -DANDROID_STL=c++_static -DCMAKE_BUILD_TYPE=Release +ppsspp libretro-ppsspp-aarch64 https://github.com/hrydgard/ppsspp.git master YES CMAKE Makefile build -DLIBRETRO=ON -DANDROID_STL=c++_static -DCMAKE_BUILD_TYPE=Release diff --git a/recipes/android/cores-android-cmake-aarch64.conf b/recipes/android/cores-android-cmake-aarch64.conf index 6b5993ac..15ee7211 100644 --- a/recipes/android/cores-android-cmake-aarch64.conf +++ b/recipes/android/cores-android-cmake-aarch64.conf @@ -1,12 +1,11 @@ ANDROID_HOME /home/buildbot/tools/android/android-sdk-linux -NDK_ROOT /home/buildbot/tools/android/android-ndk-r15c/ -ANDROID_NDK /home/buildbot/tools/android/android-ndk-r15c/ -PATH /home/buildbot/tools/android/android-ndk-r15c:/home/buildbot/tools/android/android-sdk-linux/tools +NDK_ROOT /home/buildbot/tools/android/android-ndk-r16b/ +ANDROID_NDK /home/buildbot/tools/android/android-ndk-r16b/ +PATH /home/buildbot/tools/android/android-ndk-r16b:/home/buildbot/tools/android/android-sdk-linux/tools PLATFORM android platform android MAKE make NDK ndk-build -NDK_TOOLCHAIN_VERSION 4.9 RA NO DIST arm64-v8a LIBSUFFIX _android diff --git a/recipes/android/cores-android-cmake-armv7 b/recipes/android/cores-android-cmake-armv7 index 5e68250f..56569221 100644 --- a/recipes/android/cores-android-cmake-armv7 +++ b/recipes/android/cores-android-cmake-armv7 @@ -1 +1 @@ -ppsspp libretro-ppsspp-armv7 https://github.com/hrydgard/ppsspp.git master YES CMAKE Makefile build -DLIBRETRO=ON -DANDROID_TOOLCHAIN=clang -DANDROID_STL=c++_static -DANDROID_ARM_NEON=ON -DCMAKE_BUILD_TYPE=Release +ppsspp libretro-ppsspp-armv7 https://github.com/hrydgard/ppsspp.git master YES CMAKE Makefile build -DLIBRETRO=ON -DANDROID_STL=c++_static -DANDROID_ARM_NEON=ON -DCMAKE_BUILD_TYPE=Release diff --git a/recipes/android/cores-android-cmake-armv7.conf b/recipes/android/cores-android-cmake-armv7.conf index 01cd72d0..43d31bba 100644 --- a/recipes/android/cores-android-cmake-armv7.conf +++ b/recipes/android/cores-android-cmake-armv7.conf @@ -1,12 +1,11 @@ ANDROID_HOME /home/buildbot/tools/android/android-sdk-linux -NDK_ROOT /home/buildbot/tools/android/android-ndk-r15c/ -ANDROID_NDK /home/buildbot/tools/android/android-ndk-r15c/ -PATH /home/buildbot/tools/android/android-ndk-r15c:/home/buildbot/tools/android/android-sdk-linux/tools +NDK_ROOT /home/buildbot/tools/android/android-ndk-r16b/ +ANDROID_NDK /home/buildbot/tools/android/android-ndk-r16b/ +PATH /home/buildbot/tools/android/android-ndk-r16b:/home/buildbot/tools/android/android-sdk-linux/tools PLATFORM android platform android MAKE make NDK ndk-build -NDK_TOOLCHAIN_VERSION 4.9 RA NO DIST armeabi-v7a LIBSUFFIX _android diff --git a/recipes/android/cores-android-cmake-x86 b/recipes/android/cores-android-cmake-x86 index 6c1d0047..30169af2 100644 --- a/recipes/android/cores-android-cmake-x86 +++ b/recipes/android/cores-android-cmake-x86 @@ -1 +1 @@ -ppsspp libretro-ppsspp-x86 https://github.com/hrydgard/ppsspp.git master YES CMAKE Makefile build -DLIBRETRO=ON -DANDROID_TOOLCHAIN=clang -DANDROID_STL=c++_static -DCMAKE_BUILD_TYPE=Release +ppsspp libretro-ppsspp-x86 https://github.com/hrydgard/ppsspp.git master YES CMAKE Makefile build -DLIBRETRO=ON -DANDROID_STL=c++_static -DCMAKE_BUILD_TYPE=Release diff --git a/recipes/android/cores-android-cmake-x86.conf b/recipes/android/cores-android-cmake-x86.conf index f31a15b9..7caa148a 100644 --- a/recipes/android/cores-android-cmake-x86.conf +++ b/recipes/android/cores-android-cmake-x86.conf @@ -1,12 +1,11 @@ ANDROID_HOME /home/buildbot/tools/android/android-sdk-linux -NDK_ROOT /home/buildbot/tools/android/android-ndk-r15c/ -ANDROID_NDK /home/buildbot/tools/android/android-ndk-r15c/ -PATH /home/buildbot/tools/android/android-ndk-r15c:/home/buildbot/tools/android/android-sdk-linux/tools +NDK_ROOT /home/buildbot/tools/android/android-ndk-r16b/ +ANDROID_NDK /home/buildbot/tools/android/android-ndk-r16b/ +PATH /home/buildbot/tools/android/android-ndk-r16b:/home/buildbot/tools/android/android-sdk-linux/tools PLATFORM android platform android MAKE make NDK ndk-build -NDK_TOOLCHAIN_VERSION 4.9 RA NO LIBSUFFIX _android DIST x86