diff options
| author | Chaoren Lin <chaorenl@google.com> | 2016-05-23 12:25:05 -0700 |
|---|---|---|
| committer | Chaoren Lin <chaorenl@google.com> | 2016-05-23 12:25:05 -0700 |
| commit | 2b33072db5633fb7561ea030e0fdf2b54c61fb7a (patch) | |
| tree | 8b92da56e85b67d3041df84fba5f88b12976e9b5 | |
| parent | 4cf592e062e19dcb6a2a75e05b2cd017ce1cc088 (diff) | |
| download | android-cmake-2b33072db5633fb7561ea030e0fdf2b54c61fb7a.tar.gz | |
Change default platform version to android-9.
NDK r12's minimum API level is 9 so we should default to that.
Change-Id: I0925fceb3ff39bc1bae9bc4844a9fd6c09dc2adc
| -rw-r--r-- | README.google | 7 | ||||
| -rw-r--r-- | android.toolchain.cmake | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/README.google b/README.google index 9050275..966687d 100644 --- a/README.google +++ b/README.google @@ -5,6 +5,7 @@ License File: LICENSE Description: CMake toolchain file and other scripts for the Android NDK. Local Modifications: -LICENSE file has been created for compliance purposes. Not included in original -distribution. -Added build ID for debugging. +- LICENSE file has been created for compliance purposes. Not included in original + distribution. +- Added build ID for debugging. +- Change default API level from 8 to 9. diff --git a/android.toolchain.cmake b/android.toolchain.cmake index f333025..04ed7b2 100644 --- a/android.toolchain.cmake +++ b/android.toolchain.cmake @@ -78,7 +78,7 @@ # "x86_64" - Intel64 instruction set (r1) # "mips64" - MIPS64 instruction set (r6) # -# ANDROID_NATIVE_API_LEVEL=android-8 - level of Android API compile for. +# ANDROID_NATIVE_API_LEVEL=android-9 - level of Android API compile for. # Option is read-only when standalone toolchain is used. # Note: building for "android-L" requires explicit configuration. # @@ -239,7 +239,7 @@ set( ANDROID_SUPPORTED_ABIS_mips "mips" ) set( ANDROID_SUPPORTED_ABIS_mips64 "mips64" ) # API level defaults -set( ANDROID_DEFAULT_NDK_API_LEVEL 8 ) +set( ANDROID_DEFAULT_NDK_API_LEVEL 9 ) set( ANDROID_DEFAULT_NDK_API_LEVEL_arm64 21 ) set( ANDROID_DEFAULT_NDK_API_LEVEL_x86 9 ) set( ANDROID_DEFAULT_NDK_API_LEVEL_x86_64 21 ) |