From 69012fc5e0d4869fae2369b0ad9c0b77be6ed1fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Thu, 26 Jan 2017 08:26:07 +0100 Subject: [PATCH] Update Android target to 25 --- android/AndroidManifest.xml | 2 +- android/jni/app-android.cpp | 3 ++- android/project.properties | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index f537b70082..32e067e182 100644 --- a/android/AndroidManifest.xml +++ b/android/AndroidManifest.xml @@ -7,7 +7,7 @@ + android:targetSdkVersion="25" /> diff --git a/android/jni/app-android.cpp b/android/jni/app-android.cpp index 9f2121beeb..f9721c6256 100644 --- a/android/jni/app-android.cpp +++ b/android/jni/app-android.cpp @@ -55,7 +55,8 @@ enum { ANDROID_VERSION_KITKAT = 19, ANDROID_VERSION_LOLLIPOP = 21, ANDROID_VERSION_MARSHMALLOW = 23, - ANDROID_VERSION_N = 24, + ANDROID_VERSION_NOUGAT = 24, + ANDROID_VERSION_NOUGAT_1 = 25, }; struct FrameCommand { diff --git a/android/project.properties b/android/project.properties index 7ce68660c4..f72b9716b3 100644 --- a/android/project.properties +++ b/android/project.properties @@ -11,4 +11,4 @@ #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt # Project target. -target=android-24 +target=android-25