Skip to content

Commit db1b534

Browse files
rusloruslo
authored
Merge pull request ruslo#112 from ruslo/pr.new.android
New Android
2 parents e31ca49 + e68be33 commit db1b534

File tree

49 files changed

+329
-1950
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+329
-1950
lines changed

‎android-ndk-r10e-api-16-armeabi-v7a-neon-clang-35-hid.cmake

+7-7
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,16 @@ include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_clear_environment_variables.c
1313
include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_init.cmake")
1414

1515
set(ANDROID_NDK_VERSION "r10e")
16-
set(ANDROID_NATIVE_API_LEVEL "16")
17-
set(ANDROID_ABI "armeabi-v7a with NEON")
18-
set(ANDROID_TOOLCHAIN_NAME "arm-linux-androideabi-clang3.5")
16+
set(CMAKE_SYSTEM_VERSION "16")
17+
set(CMAKE_ANDROID_ARCH_ABI "armeabi-v7a")
18+
set(CMAKE_ANDROID_ARM_NEON TRUE)
19+
set(CMAKE_ANDROID_ARM_MODE TRUE) # 32-bit ARM
20+
set(CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION "clang3.5")
1921

2022
polly_init(
2123
"Android NDK ${ANDROID_NDK_VERSION} / \
22-
API ${ANDROID_NATIVE_API_LEVEL} / ${ANDROID_ABI} / \
23-
c++11 support"
24+
API ${CMAKE_SYSTEM_VERSION} / ${CMAKE_ANDROID_ARCH_ABI} / \
25+
NEON / 32-bit ARM / Clang 3.5 / c++11 support"
2426
"Unix Makefiles"
2527
)
2628

@@ -29,5 +31,3 @@ include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_common.cmake")
2931
include("${CMAKE_CURRENT_LIST_DIR}/flags/cxx11.cmake") # before toolchain!
3032
include("${CMAKE_CURRENT_LIST_DIR}/flags/hidden.cmake")
3133
include("${CMAKE_CURRENT_LIST_DIR}/os/android.cmake")
32-
33-

‎android-ndk-r10e-api-16-armeabi-v7a-neon-clang-35.cmake

+7-5
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,16 @@ include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_clear_environment_variables.c
1313
include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_init.cmake")
1414

1515
set(ANDROID_NDK_VERSION "r10e")
16-
set(ANDROID_NATIVE_API_LEVEL "16")
17-
set(ANDROID_ABI "armeabi-v7a with NEON")
18-
set(ANDROID_TOOLCHAIN_NAME "arm-linux-androideabi-clang3.5")
16+
set(CMAKE_SYSTEM_VERSION "16")
17+
set(CMAKE_ANDROID_ARCH_ABI "armeabi-v7a")
18+
set(CMAKE_ANDROID_ARM_NEON TRUE)
19+
set(CMAKE_ANDROID_ARM_MODE TRUE) # 32-bit ARM
20+
set(CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION "clang3.5")
1921

2022
polly_init(
2123
"Android NDK ${ANDROID_NDK_VERSION} / \
22-
API ${ANDROID_NATIVE_API_LEVEL} / ${ANDROID_ABI} / \
23-
c++11 support"
24+
API ${CMAKE_SYSTEM_VERSION} / ${CMAKE_ANDROID_ARCH_ABI} / \
25+
NEON / 32-bit ARM / Clang 3.5 / c++11 support"
2426
"Unix Makefiles"
2527
)
2628

‎android-ndk-r10e-api-16-armeabi-v7a-neon.cmake

+6-4
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,15 @@ include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_clear_environment_variables.c
1313
include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_init.cmake")
1414

1515
set(ANDROID_NDK_VERSION "r10e")
16-
set(ANDROID_NATIVE_API_LEVEL "16")
17-
set(ANDROID_ABI "armeabi-v7a with NEON")
16+
set(CMAKE_SYSTEM_VERSION "16")
17+
set(CMAKE_ANDROID_ARCH_ABI "armeabi-v7a")
18+
set(CMAKE_ANDROID_ARM_NEON TRUE)
19+
set(CMAKE_ANDROID_ARM_MODE TRUE) # 32-bit ARM
1820

1921
polly_init(
2022
"Android NDK ${ANDROID_NDK_VERSION} / \
21-
API ${ANDROID_NATIVE_API_LEVEL} / ${ANDROID_ABI} / \
22-
c++11 support"
23+
API ${CMAKE_SYSTEM_VERSION} / ${CMAKE_ANDROID_ARCH_ABI} / \
24+
NEON / 32-bit ARM / c++11 support"
2325
"Unix Makefiles"
2426
)
2527

‎android-ndk-r10e-api-16-x86-hid.cmake

+3-5
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,13 @@ include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_clear_environment_variables.c
1111

1212
include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_init.cmake")
1313

14-
set(ANDROID_FORCE_ARM_BUILD "OFF")
1514
set(ANDROID_NDK_VERSION "r10e")
16-
set(ANDROID_NATIVE_API_LEVEL "16")
17-
set(ANDROID_ABI "x86")
18-
set(ANDROID_TOOLCHAIN_NAME "x86-4.9")
15+
set(CMAKE_SYSTEM_VERSION "16")
16+
set(CMAKE_ANDROID_ARCH_ABI "x86")
1917

2018
polly_init(
2119
"Android NDK ${ANDROID_NDK_VERSION} / \
22-
API ${ANDROID_NATIVE_API_LEVEL} / ${ANDROID_ABI} / \
20+
API ${CMAKE_SYSTEM_VERSION} / ${CMAKE_ANDROID_ARCH_ABI} / \
2321
hidden visibility / \
2422
c++11 support"
2523
"Unix Makefiles"

‎android-ndk-r10e-api-16-x86.cmake

+3-5
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,13 @@ include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_clear_environment_variables.c
1111

1212
include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_init.cmake")
1313

14-
set(ANDROID_FORCE_ARM_BUILD "OFF")
1514
set(ANDROID_NDK_VERSION "r10e")
16-
set(ANDROID_NATIVE_API_LEVEL "16")
17-
set(ANDROID_ABI "x86")
18-
set(ANDROID_TOOLCHAIN_NAME "x86-4.9")
15+
set(CMAKE_SYSTEM_VERSION "16")
16+
set(CMAKE_ANDROID_ARCH_ABI "x86")
1917

2018
polly_init(
2119
"Android NDK ${ANDROID_NDK_VERSION} / \
22-
API ${ANDROID_NATIVE_API_LEVEL} / ${ANDROID_ABI} / \
20+
API ${CMAKE_SYSTEM_VERSION} / ${CMAKE_ANDROID_ARCH_ABI} / \
2321
c++11 support"
2422
"Unix Makefiles"
2523
)

‎android-ndk-r10e-api-19-armeabi-v7a-neon.cmake

+6-4
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,15 @@ include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_clear_environment_variables.c
1414
include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_init.cmake")
1515

1616
set(ANDROID_NDK_VERSION "r10e")
17-
set(ANDROID_NATIVE_API_LEVEL "19")
18-
set(ANDROID_ABI "armeabi-v7a with NEON")
17+
set(CMAKE_SYSTEM_VERSION "19")
18+
set(CMAKE_ANDROID_ARCH_ABI "armeabi-v7a")
19+
set(CMAKE_ANDROID_ARM_NEON TRUE)
20+
set(CMAKE_ANDROID_ARM_MODE TRUE) # 32-bit ARM
1921

2022
polly_init(
2123
"Android NDK ${ANDROID_NDK_VERSION} / \
22-
API ${ANDROID_NATIVE_API_LEVEL} / ${ANDROID_ABI} / \
23-
c++11 support"
24+
API ${CMAKE_SYSTEM_VERSION} / ${CMAKE_ANDROID_ARCH_ABI} / \
25+
NEON / 32-bit ARM / c++11 support"
2426
"Unix Makefiles"
2527
)
2628

‎android-ndk-r10e-api-21-arm64-v8a-clang-35.cmake

+5-5
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_clear_environment_variables.c
1313
include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_init.cmake")
1414

1515
set(ANDROID_NDK_VERSION "r10e")
16-
set(ANDROID_NATIVE_API_LEVEL "21")
17-
set(ANDROID_ABI "arm64-v8a")
18-
set(ANDROID_TOOLCHAIN_NAME "aarch64-linux-android-clang3.5")
16+
set(CMAKE_SYSTEM_VERSION "21")
17+
set(CMAKE_ANDROID_ARCH_ABI "arm64-v8a")
18+
set(CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION "clang3.5")
1919

2020
polly_init(
2121
"Android NDK ${ANDROID_NDK_VERSION} / \
22-
API ${ANDROID_NATIVE_API_LEVEL} / ${ANDROID_ABI} / \
23-
c++11 support"
22+
API ${CMAKE_SYSTEM_VERSION} / ${CMAKE_ANDROID_ARCH_ABI} / \
23+
Clang 3.5 / c++11 support"
2424
"Unix Makefiles"
2525
)
2626

‎android-ndk-r10e-api-21-arm64-v8a-gcc-49-hid.cmake

+5-6
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_clear_environment_variables.c
1313
include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_init.cmake")
1414

1515
set(ANDROID_NDK_VERSION "r10e")
16-
set(ANDROID_NATIVE_API_LEVEL "21")
17-
set(ANDROID_ABI "arm64-v8a")
18-
set(ANDROID_TOOLCHAIN_NAME "aarch64-linux-android-4.9")
16+
set(CMAKE_SYSTEM_VERSION "21")
17+
set(CMAKE_ANDROID_ARCH_ABI "arm64-v8a")
18+
set(CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION "4.9")
1919

2020
polly_init(
2121
"Android NDK ${ANDROID_NDK_VERSION} / \
22-
API ${ANDROID_NATIVE_API_LEVEL} / ${ANDROID_ABI} / \
23-
c++11 support"
22+
API ${CMAKE_SYSTEM_VERSION} / ${CMAKE_ANDROID_ARCH_ABI} / \
23+
GCC 4.9 / c++11 support"
2424
"Unix Makefiles"
2525
)
2626

@@ -29,4 +29,3 @@ include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_common.cmake")
2929
include("${CMAKE_CURRENT_LIST_DIR}/flags/cxx11.cmake") # before toolchain!
3030
include("${CMAKE_CURRENT_LIST_DIR}/flags/hidden.cmake")
3131
include("${CMAKE_CURRENT_LIST_DIR}/os/android.cmake")
32-

‎android-ndk-r10e-api-21-arm64-v8a-gcc-49.cmake

+5-5
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_clear_environment_variables.c
1313
include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_init.cmake")
1414

1515
set(ANDROID_NDK_VERSION "r10e")
16-
set(ANDROID_NATIVE_API_LEVEL "21")
17-
set(ANDROID_ABI "arm64-v8a")
18-
set(ANDROID_TOOLCHAIN_NAME "aarch64-linux-android-4.9")
16+
set(CMAKE_SYSTEM_VERSION "21")
17+
set(CMAKE_ANDROID_ARCH_ABI "arm64-v8a")
18+
set(CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION "4.9")
1919

2020
polly_init(
2121
"Android NDK ${ANDROID_NDK_VERSION} / \
22-
API ${ANDROID_NATIVE_API_LEVEL} / ${ANDROID_ABI} / \
23-
c++11 support"
22+
API ${CMAKE_SYSTEM_VERSION} / ${CMAKE_ANDROID_ARCH_ABI} / \
23+
GCC 4.9 / c++11 support"
2424
"Unix Makefiles"
2525
)
2626

‎android-ndk-r10e-api-21-arm64-v8a.cmake

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_clear_environment_variables.c
1212
include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_init.cmake")
1313

1414
set(ANDROID_NDK_VERSION "r10e")
15-
set(ANDROID_NATIVE_API_LEVEL "21")
16-
set(ANDROID_ABI "arm64-v8a")
15+
set(CMAKE_SYSTEM_VERSION "21")
16+
set(CMAKE_ANDROID_ARCH_ABI "arm64-v8a")
1717

1818
polly_init(
1919
"Android NDK ${ANDROID_NDK_VERSION} / \
20-
API ${ANDROID_NATIVE_API_LEVEL} / ${ANDROID_ABI} / \
20+
API ${CMAKE_SYSTEM_VERSION} / ${CMAKE_ANDROID_ARCH_ABI} / \
2121
c++11 support"
2222
"Unix Makefiles"
2323
)

‎android-ndk-r10e-api-21-armeabi-v7a-neon-clang-35.cmake

+9-5
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,21 @@ include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_clear_environment_variables.c
1313
include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_init.cmake")
1414

1515
set(ANDROID_NDK_VERSION "r10e")
16-
set(ANDROID_NATIVE_API_LEVEL "21")
17-
set(ANDROID_ABI "armeabi-v7a with NEON")
18-
set(ANDROID_TOOLCHAIN_NAME "arm-linux-androideabi-clang3.5")
16+
set(CMAKE_SYSTEM_VERSION "21")
17+
set(CMAKE_ANDROID_ARCH_ABI "armeabi-v7a")
18+
set(CMAKE_ANDROID_ARM_NEON TRUE)
19+
set(CMAKE_ANDROID_ARM_MODE TRUE) # 32-bit ARM
20+
set(CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION "clang3.5")
1921

2022
polly_init(
2123
"Android NDK ${ANDROID_NDK_VERSION} / \
22-
API ${ANDROID_NATIVE_API_LEVEL} / ${ANDROID_ABI} / ${ANDROID_STL} / ${ANDROID_TOOLCHAIN_NAME} \
23-
c++11 support"
24+
API ${CMAKE_SYSTEM_VERSION} / ${CMAKE_ANDROID_ARCH_ABI} / \
25+
NEON / 32-bit ARM / Clang 3.5 / c++11 support"
2426
"Unix Makefiles"
2527
)
2628

2729
include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_common.cmake")
30+
2831
include("${CMAKE_CURRENT_LIST_DIR}/flags/cxx11.cmake") # before toolchain!
32+
2933
include("${CMAKE_CURRENT_LIST_DIR}/os/android.cmake")

‎android-ndk-r10e-api-21-armeabi-v7a-neon.cmake

+6-4
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,15 @@ include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_clear_environment_variables.c
1313
include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_init.cmake")
1414

1515
set(ANDROID_NDK_VERSION "r10e")
16-
set(ANDROID_NATIVE_API_LEVEL "21")
17-
set(ANDROID_ABI "armeabi-v7a with NEON")
16+
set(CMAKE_SYSTEM_VERSION "21")
17+
set(CMAKE_ANDROID_ARCH_ABI "armeabi-v7a")
18+
set(CMAKE_ANDROID_ARM_NEON TRUE)
19+
set(CMAKE_ANDROID_ARM_MODE TRUE) # 32-bit ARM
1820

1921
polly_init(
2022
"Android NDK ${ANDROID_NDK_VERSION} / \
21-
API ${ANDROID_NATIVE_API_LEVEL} / ${ANDROID_ABI} / \
22-
c++11 support"
23+
API ${CMAKE_SYSTEM_VERSION} / ${CMAKE_ANDROID_ARCH_ABI} / \
24+
NEON / 32-bit ARM / c++11 support"
2325
"Unix Makefiles"
2426
)
2527

‎android-ndk-r10e-api-21-armeabi-v7a.cmake

+6-4
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,15 @@ include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_clear_environment_variables.c
1212
include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_init.cmake")
1313

1414
set(ANDROID_NDK_VERSION "r10e")
15-
set(ANDROID_NATIVE_API_LEVEL "21")
16-
set(ANDROID_ABI "armeabi-v7a")
15+
set(CMAKE_SYSTEM_VERSION "21")
16+
set(CMAKE_ANDROID_ARCH_ABI "armeabi-v7a")
17+
set(CMAKE_ANDROID_ARM_NEON FALSE)
18+
set(CMAKE_ANDROID_ARM_MODE TRUE) # 32-bit ARM
1719

1820
polly_init(
1921
"Android NDK ${ANDROID_NDK_VERSION} / \
20-
API ${ANDROID_NATIVE_API_LEVEL} / ${ANDROID_ABI} / \
21-
c++11 support"
22+
API ${CMAKE_SYSTEM_VERSION} / ${CMAKE_ANDROID_ARCH_ABI} / \
23+
32-bit ARM / c++11 support"
2224
"Unix Makefiles"
2325
)
2426

‎android-ndk-r10e-api-21-armeabi.cmake

+5-4
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,14 @@ include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_clear_environment_variables.c
1313
include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_init.cmake")
1414

1515
set(ANDROID_NDK_VERSION "r10e")
16-
set(ANDROID_NATIVE_API_LEVEL "21")
17-
set(ANDROID_ABI "armeabi")
16+
set(CMAKE_SYSTEM_VERSION "21")
17+
set(CMAKE_ANDROID_ARCH_ABI "armeabi")
18+
set(CMAKE_ANDROID_ARM_MODE TRUE) # 32-bit ARM
1819

1920
polly_init(
2021
"Android NDK ${ANDROID_NDK_VERSION} / \
21-
API ${ANDROID_NATIVE_API_LEVEL} / ${ANDROID_ABI} / \
22-
c++11 support"
22+
API ${CMAKE_SYSTEM_VERSION} / ${CMAKE_ANDROID_ARCH_ABI} / \
23+
32-bit ARM / c++11 support"
2324
"Unix Makefiles"
2425
)
2526

‎android-ndk-r10e-api-21-mips.cmake

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_clear_environment_variables.c
1313
include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_init.cmake")
1414

1515
set(ANDROID_NDK_VERSION "r10e")
16-
set(ANDROID_NATIVE_API_LEVEL "21")
17-
set(ANDROID_ABI "mips")
16+
set(CMAKE_SYSTEM_VERSION "21")
17+
set(CMAKE_ANDROID_ARCH_ABI "mips")
1818

1919
polly_init(
2020
"Android NDK ${ANDROID_NDK_VERSION} / \
21-
API ${ANDROID_NATIVE_API_LEVEL} / ${ANDROID_ABI} / \
21+
API ${CMAKE_SYSTEM_VERSION} / ${CMAKE_ANDROID_ARCH_ABI} / \
2222
c++11 support"
2323
"Unix Makefiles"
2424
)

‎android-ndk-r10e-api-21-mips64.cmake

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_clear_environment_variables.c
1313
include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_init.cmake")
1414

1515
set(ANDROID_NDK_VERSION "r10e")
16-
set(ANDROID_NATIVE_API_LEVEL "21")
17-
set(ANDROID_ABI "mips64")
16+
set(CMAKE_SYSTEM_VERSION "21")
17+
set(CMAKE_ANDROID_ARCH_ABI "mips64")
1818

1919
polly_init(
2020
"Android NDK ${ANDROID_NDK_VERSION} / \
21-
API ${ANDROID_NATIVE_API_LEVEL} / ${ANDROID_ABI} / \
21+
API ${CMAKE_SYSTEM_VERSION} / ${CMAKE_ANDROID_ARCH_ABI} / \
2222
c++11 support"
2323
"Unix Makefiles"
2424
)

‎android-ndk-r10e-api-21-x86-64-hid.cmake

+3-5
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,13 @@ include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_clear_environment_variables.c
1111

1212
include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_init.cmake")
1313

14-
set(ANDROID_FORCE_ARM_BUILD "OFF")
1514
set(ANDROID_NDK_VERSION "r10e")
16-
set(ANDROID_NATIVE_API_LEVEL "21")
17-
set(ANDROID_ABI "x86_64")
18-
set(ANDROID_TOOLCHAIN_NAME "x86_64-4.9")
15+
set(CMAKE_SYSTEM_VERSION "21")
16+
set(CMAKE_ANDROID_ARCH_ABI "x86_64")
1917

2018
polly_init(
2119
"Android NDK ${ANDROID_NDK_VERSION} / \
22-
API ${ANDROID_NATIVE_API_LEVEL} / ${ANDROID_ABI} / \
20+
API ${CMAKE_SYSTEM_VERSION} / ${CMAKE_ANDROID_ARCH_ABI} / \
2321
hidden visibility / \
2422
c++11 support"
2523
"Unix Makefiles"

‎android-ndk-r10e-api-21-x86-64.cmake

+3-5
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,12 @@ include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_clear_environment_variables.c
1212
include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_init.cmake")
1313

1414
set(ANDROID_NDK_VERSION "r10e")
15-
set(ANDROID_NATIVE_API_LEVEL "21")
16-
set(ANDROID_ABI "x86_64")
17-
set(ANDROID_TOOLCHAIN_NAME "x86_64-4.9")
15+
set(CMAKE_SYSTEM_VERSION "21")
16+
set(CMAKE_ANDROID_ARCH_ABI "x86_64")
1817

1918
polly_init(
2019
"Android NDK ${ANDROID_NDK_VERSION} / \
21-
API ${ANDROID_NATIVE_API_LEVEL} / ${ANDROID_ABI} / \
20+
API ${CMAKE_SYSTEM_VERSION} / ${CMAKE_ANDROID_ARCH_ABI} / \
2221
c++11 support"
2322
"Unix Makefiles"
2423
)
@@ -28,4 +27,3 @@ include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_common.cmake")
2827
include("${CMAKE_CURRENT_LIST_DIR}/flags/cxx11.cmake") # before toolchain!
2928

3029
include("${CMAKE_CURRENT_LIST_DIR}/os/android.cmake")
31-

‎android-ndk-r10e-api-21-x86.cmake

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_clear_environment_variables.c
1212
include("${CMAKE_CURRENT_LIST_DIR}/utilities/polly_init.cmake")
1313

1414
set(ANDROID_NDK_VERSION "r10e")
15-
set(ANDROID_NATIVE_API_LEVEL "21")
16-
set(ANDROID_ABI "x86")
15+
set(CMAKE_SYSTEM_VERSION "21")
16+
set(CMAKE_ANDROID_ARCH_ABI "x86")
1717

1818
polly_init(
1919
"Android NDK ${ANDROID_NDK_VERSION} / \
20-
API ${ANDROID_NATIVE_API_LEVEL} / ${ANDROID_ABI} / \
20+
API ${CMAKE_SYSTEM_VERSION} / ${CMAKE_ANDROID_ARCH_ABI} / \
2121
c++11 support"
2222
"Unix Makefiles"
2323
)

0 commit comments

Comments
 (0)