Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add ndk 27 and bump minSdk to 21 #1819

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
Open
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
feat: ndk27
Min API support is now 21
triniwiz committed Jul 30, 2024
commit e8b67a4178726d9ef5be380a93f3e65b1d2c9675
18 changes: 9 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
@@ -11,19 +11,19 @@
],
"version_info": {
"v8": "10.3.22.0",
"gradle": "8.4",
"gradleAndroid": "8.3.2",
"ndk": "r23c",
"ndkApiLevel": "17",
"minSdk": "17",
"compileSdk": "34",
"buildTools": "34.0.0",
"gradle": "8.7",
"gradleAndroid": "8.5.0",
"ndk": "r27",
"ndkApiLevel": "21",
"minSdk": "21",
"compileSdk": "35",
"buildTools": "35.0.0",
"kotlin": "2.0.0"
},
"// this gradle key is here for backwards compatibility - we'll phase it out slowly...": "",
"gradle": {
"version": "8.4",
"android": "8.3.2"
"version": "8.7",
"android": "8.5.0"
},
"scripts": {
"changelog": "conventional-changelog -p angular -i CHANGELOG.md -s",
2 changes: 1 addition & 1 deletion test-app/gradle.properties
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@ android.useAndroidX=true
# Default versions used throughout the gradle configurations
NS_DEFAULT_BUILD_TOOLS_VERSION=35.0.0
NS_DEFAULT_COMPILE_SDK_VERSION=35
NS_DEFAULT_MIN_SDK_VERSION=17
NS_DEFAULT_MIN_SDK_VERSION=21
NS_DEFAULT_ANDROID_BUILD_TOOLS_VERSION=8.5.0

ns_default_androidx_appcompat_version = 1.5.1
7 changes: 1 addition & 6 deletions test-app/runtime/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@ endif (CCACHE_FOUND AND (USE_CCACHE))
# "-DANDROID_STL=c++_static" is just not enough for clang++ to find some libraries in the ndk
MESSAGE(STATUS "## ANDROID_NDK_ROOT: " ${ANDROID_NDK_ROOT})

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")
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 -Wno-vla-extension -Wno-deprecated")

if("${ANDROID_ABI}" MATCHES "arm64-v8a$" OR "${ANDROID_ABI}" MATCHES "x86_64$")
# Enable pointer compression on 64 bit platforms
@@ -182,11 +182,6 @@ if("${ANDROID_ABI}" MATCHES "armeabi-v7a$" OR "${ANDROID_ABI}" MATCHES "x86$")
target_link_libraries(NativeScript ${ANDROID_NDK_ROOT}/sources/cxx-stl/llvm-libc++/libs/${ANDROID_ABI}/libandroid_support.a)
endif()


if("${ANDROID_ABI}" MATCHES "arm64-v8a$" OR "${ANDROID_ABI}" MATCHES "x86_64$")
target_link_options(NativeScript PRIVATE "-Wl,-z,max-page-size=16384")
endif()

# Command info: https://cmake.org/cmake/help/v3.4/command/find_library.html
# Searches for a specified prebuilt library and stores the path as a
# variable. Because CMake includes system libraries in the search path by
4 changes: 2 additions & 2 deletions test-app/runtime/build.gradle
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@ if (useCCache) {
}


def defaultNdkVersion = "23.2.8568313"
def defaultNdkVersion = "27.0.12077973"

def hasNdkVersion = project.hasProperty("ndkVersion")
if (hasNdkVersion) {
@@ -114,7 +114,7 @@ android {
// arguments "-DANDROID_TOOLCHAIN=clang", "-DANDROID_STL=c++_static", "-DANDROID_NDK_ROOT=${NDK_PATH}"

cppFlags "-std=c++14"
arguments "-DANDROID_STL=c++_static", "-DANDROID_NDK_ROOT=${NDK_PATH}"
arguments "-DANDROID_STL=c++_shared", "-DANDROID_NDK_ROOT=${NDK_PATH}", "-DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON"
}
}