Skip to content

Commit 196cda9

Browse files
committed
fix: latest NDK
BREAKING CHANGE: minSDK is now 21
1 parent eaf47f0 commit 196cda9

File tree

4 files changed

+9
-6
lines changed

4 files changed

+9
-6
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
"gradle": "8.4",
1515
"gradleAndroid": "8.3.2",
1616
"ndk": "r23c",
17-
"ndkApiLevel": "17",
18-
"minSdk": "17",
17+
"ndkApiLevel": "21",
18+
"minSdk": "21",
1919
"compileSdk": "34",
2020
"buildTools": "34.0.0",
2121
"kotlin": "2.0.0"

test-app/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ android.useAndroidX=true
2121
# Default versions used throughout the gradle configurations
2222
NS_DEFAULT_BUILD_TOOLS_VERSION=34.0.0
2323
NS_DEFAULT_COMPILE_SDK_VERSION=34
24-
NS_DEFAULT_MIN_SDK_VERSION=17
24+
NS_DEFAULT_MIN_SDK_VERSION=21
2525
NS_DEFAULT_ANDROID_BUILD_TOOLS_VERSION=8.3.2
2626

2727
ns_default_androidx_appcompat_version = 1.6.1

test-app/runtime/CMakeLists.txt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ MESSAGE(STATUS "## ANDROID_NDK_ROOT: " ${ANDROID_NDK_ROOT})
2020

2121
set(COMMON_CMAKE_ARGUMENTS "-std=c++17 -Werror -Wno-unused-result -mstackrealign -fexceptions -fno-builtin-stpcpy -fno-rtti -DV8_31BIT_SMIS_ON_64BIT_ARCH -DV8_31BIT_SMIS_ON_64BIT_ARCH -DV8_ENABLE_REGEXP_INTERPRETER_THREADED_DISPATCH -DV8_EMBEDDED_BUILTINS")
2222

23+
#enable support for devices that use a 16KiB page size (https://developer.android.com/guide/practices/page-sizes)
24+
set(COMMON_CMAKE_ARGUMENTS "${COMMON_CMAKE_ARGUMENTS} -DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON")
25+
2326
if("${ANDROID_ABI}" MATCHES "arm64-v8a$" OR "${ANDROID_ABI}" MATCHES "x86_64$")
2427
# Enable pointer compression on 64 bit platforms
2528
set(COMMON_CMAKE_ARGUMENTS "${COMMON_CMAKE_ARGUMENTS} -DV8_COMPRESS_POINTERS")
@@ -178,8 +181,8 @@ target_link_libraries(NativeScript ${PROJECT_SOURCE_DIR}/src/main/libs/${ANDROID
178181
if("${ANDROID_ABI}" MATCHES "armeabi-v7a$" OR "${ANDROID_ABI}" MATCHES "x86$")
179182
# On API Level 19 and lower we need to link with android_support
180183
# because it contains some implementation of functions such as "strtoll" and "strtoul"
181-
MESSAGE(STATUS "# Linking with libandroid_support.a")
182-
target_link_libraries(NativeScript ${ANDROID_NDK_ROOT}/sources/cxx-stl/llvm-libc++/libs/${ANDROID_ABI}/libandroid_support.a)
184+
#MESSAGE(STATUS "# Linking with libandroid_support.a")
185+
#target_link_libraries(NativeScript ${ANDROID_NDK_ROOT}/sources/cxx-stl/llvm-libc++/libs/${ANDROID_ABI}/libandroid_support.a)
183186
endif()
184187

185188
# Command info: https://cmake.org/cmake/help/v3.4/command/find_library.html

0 commit comments

Comments
 (0)