From 8ae9df5607b259ea1614ff4eabc023b088d32eb2 Mon Sep 17 00:00:00 2001 From: bebopagogo Date: Sat, 2 Sep 2023 22:15:23 -0400 Subject: [PATCH] updated gradle and tweaked build.gradle file to API version 24 --- android/lib/CMakeLists.txt | 2 +- android/lib/build.gradle | 5 ++--- protolib | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/android/lib/CMakeLists.txt b/android/lib/CMakeLists.txt index 9af9a43..f92cd84 100755 --- a/android/lib/CMakeLists.txt +++ b/android/lib/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.4.1) project("norm") -add_definitions("-DANDROID=1" "-DANDROID_API_VERSION=15" "-DPUSH_NOTIFICATIONS=1" "-DANDROID" "-DLINUX" "-DUNIX" "-DHAVE_IPV6" "-DHAVE_DIRFD" "-DPROTO_DEBUG" "-DHAVE_ASSERT" "-DHAVE_GETLOGIN" "-DUSE_SELECT" "-D_FILE_OFFSET_BITS=64" "-DHAVE_OLD_SIGNALHANDLER" "-DHAVE_SCHED" "-DNO_SCM_RIGHTS" "-Wno-attributes" "-DAPP_VERSION=1.0.0" "-DAPP_VERSION_HEX=0x10000") +add_definitions("-DANDROID=1" "-DANDROID_API_VERSION=24" "-DPUSH_NOTIFICATIONS=1" "-DANDROID" "-DLINUX" "-DUNIX" "-DHAVE_IPV6" "-DHAVE_DIRFD" "-DPROTO_DEBUG" "-DHAVE_ASSERT" "-DHAVE_GETLOGIN" "-DUSE_SELECT" "-D_FILE_OFFSET_BITS=64" "-DHAVE_OLD_SIGNALHANDLER" "-DHAVE_SCHED" "-DNO_SCM_RIGHTS" "-Wno-attributes" "-DAPP_VERSION=1.0.0" "-DAPP_VERSION_HEX=0x10000") include_directories( AFTER "../../OID_NDK}/sources/android/cpufeatures" diff --git a/android/lib/build.gradle b/android/lib/build.gradle index 40cc8cb..d6e768a 100755 --- a/android/lib/build.gradle +++ b/android/lib/build.gradle @@ -1,8 +1,7 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 31 - buildToolsVersion "28.0.3" + compileSdkVersion 34 externalNativeBuild { cmake { path "CMakeLists.txt" @@ -21,7 +20,7 @@ android { defaultConfig { externalNativeBuild { cmake { - arguments "-DANDROID_TOOLCHAIN=clang", "-DANDROID_PLATFORM=android-15", "-DCMAKE_MAKE_PROGRAM=/usr/local/bin/ninja", "-DANDROID_STL=c++_static", "-DANDROID_CPP_FEATURES=exceptions rtti", "-DANDROID_ARM_MODE=arm", "-DANDROID_ARM_NEON=TRUE" + arguments "-DANDROID_TOOLCHAIN=clang", "-DANDROID_PLATFORM=android-24", "-DCMAKE_MAKE_PROGRAM=/usr/local/bin/ninja", "-DANDROID_STL=c++_static", "-DANDROID_CPP_FEATURES=exceptions rtti", "-DANDROID_ARM_MODE=arm", "-DANDROID_ARM_NEON=TRUE" cFlags "-fsigned-char" cppFlags "-fsigned-char", "-std=c++14" } diff --git a/protolib b/protolib index 7323fd3..191df8d 160000 --- a/protolib +++ b/protolib @@ -1 +1 @@ -Subproject commit 7323fd3455ea6c16137ad3b84c950d74cc21055b +Subproject commit 191df8d69be6665298c207c1ba55222a1f4d5fc9