From a6662c53ced629a9d94611276743cbcde896b6af Mon Sep 17 00:00:00 2001 From: David Neto Date: Wed, 31 May 2023 12:50:48 -0400 Subject: [PATCH] ndk-build: test Android API 24 Vulkan was introduced in Android API 24. Test against that API level. NDKs drop support for older APIs Google-internal BUG=285134453 --- kokoro/android-ndk-build/build-docker.sh | 1 + ndk_test/jni/Application.mk | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/kokoro/android-ndk-build/build-docker.sh b/kokoro/android-ndk-build/build-docker.sh index 2b23b27a..94edcd3f 100755 --- a/kokoro/android-ndk-build/build-docker.sh +++ b/kokoro/android-ndk-build/build-docker.sh @@ -43,6 +43,7 @@ using ndk-r21d export NDK_PROJECT_PATH="${ROOT_DIR}/ndk_test" export APP_BUILD_SCRIPT="${ROOT_DIR}/ndk_test/Android.mk" +export APP_PLATFORM=android-24 # Vulkan introduced in API 24 echo "Building..." ndk-build -j diff --git a/ndk_test/jni/Application.mk b/ndk_test/jni/Application.mk index 07b76157..0eb8ffdf 100644 --- a/ndk_test/jni/Application.mk +++ b/ndk_test/jni/Application.mk @@ -34,5 +34,5 @@ APP_ABI := all APP_BUILD_SCRIPT := Android.mk APP_STL := c++_static -APP_PLATFORM := android-9 +APP_PLATFORM := android-24 NDK_TOOLCHAIN_VERSION := 4.9