Skip to content

Commit 3423e6f

Browse files
authored
feat: support 16 KB page sizes, gradle 8.5 (#1818)
1 parent 4d38f93 commit 3423e6f

File tree

4 files changed

+10
-5
lines changed

4 files changed

+10
-5
lines changed

test-app/gradle.properties

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ android.enableJetifier=true
1919
android.useAndroidX=true
2020

2121
# Default versions used throughout the gradle configurations
22-
NS_DEFAULT_BUILD_TOOLS_VERSION=34.0.0
23-
NS_DEFAULT_COMPILE_SDK_VERSION=34
22+
NS_DEFAULT_BUILD_TOOLS_VERSION=35.0.0
23+
NS_DEFAULT_COMPILE_SDK_VERSION=35
2424
NS_DEFAULT_MIN_SDK_VERSION=17
25-
NS_DEFAULT_ANDROID_BUILD_TOOLS_VERSION=8.3.2
25+
NS_DEFAULT_ANDROID_BUILD_TOOLS_VERSION=8.5.0
2626

2727
ns_default_androidx_appcompat_version = 1.5.1
2828
ns_default_androidx_exifinterface_version = 1.3.7
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-8.4-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

test-app/runtime/CMakeLists.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,11 @@ if("${ANDROID_ABI}" MATCHES "armeabi-v7a$" OR "${ANDROID_ABI}" MATCHES "x86$")
182182
target_link_libraries(NativeScript ${ANDROID_NDK_ROOT}/sources/cxx-stl/llvm-libc++/libs/${ANDROID_ABI}/libandroid_support.a)
183183
endif()
184184

185+
186+
if("${ANDROID_ABI}" MATCHES "arm64-v8a$" OR "${ANDROID_ABI}" MATCHES "x86_64$")
187+
target_link_options(NativeScript PRIVATE "-Wl,-z,max-page-size=16384")
188+
endif()
189+
185190
# Command info: https://cmake.org/cmake/help/v3.4/command/find_library.html
186191
# Searches for a specified prebuilt library and stores the path as a
187192
# variable. Because CMake includes system libraries in the search path by

test-app/runtime/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ android {
114114
// arguments "-DANDROID_TOOLCHAIN=clang", "-DANDROID_STL=c++_static", "-DANDROID_NDK_ROOT=${NDK_PATH}"
115115

116116
cppFlags "-std=c++14"
117-
arguments "-DANDROID_STL=c++_shared", "-DANDROID_NDK_ROOT=${NDK_PATH}"
117+
arguments "-DANDROID_STL=c++_static", "-DANDROID_NDK_ROOT=${NDK_PATH}"
118118
}
119119
}
120120

0 commit comments

Comments
 (0)