v15.9.4

chiteroman · Mar 6, 2024 · 8e239aa · 8e239aa
1 parent e2a292a
commit 8e239aa
Show file tree

Hide file tree

Showing 9 changed files with 219 additions and 235 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -12,14 +12,10 @@ android {
         applicationId = "es.chiteroman.playintegrityfix"
         minSdk = 26
         targetSdk = 34
-        versionCode = 15930
-        versionName = "v15.9.3"
+        versionCode = 15940
+        versionName = "v15.9.4"
         multiDexEnabled = false
 
-        buildFeatures {
-            prefab = true
-        }
-
         packaging {
             jniLibs {
                 excludes += "**/liblog.so"
@@ -29,18 +25,16 @@ android {
 
         externalNativeBuild {
             cmake {
-                arguments += "-DANDROID_STL=none"
-                arguments += "-DCMAKE_BUILD_TYPE=MinSizeRel"
-
-                cFlags += "-std=c2x"
-                cFlags += "-fvisibility=hidden"
-                cFlags += "-fvisibility-inlines-hidden"
+                arguments += "-DANDROID_STL=c++_static"
+                arguments += "-DCMAKE_BUILD_TYPE=Release"
+                arguments += "-DPlugin.Android.BionicLinkerUtil=ON"
 
-                cppFlags += "-std=c++2b"
+                cppFlags += "-std=c++20"
                 cppFlags += "-fno-exceptions"
                 cppFlags += "-fno-rtti"
                 cppFlags += "-fvisibility=hidden"
                 cppFlags += "-fvisibility-inlines-hidden"
+                cppFlags += "-flto"
             }
         }
     }
@@ -67,10 +61,6 @@ android {
     }
 }
 
-dependencies {
-    implementation("dev.rikka.ndk.thirdparty:cxx:1.2.0")
-}
-
 tasks.register("updateModuleProp") {
     doLast {
         val versionName = project.android.defaultConfig.versionName

diff --git a/app/src/main/cpp/CMakeLists.txt b/app/src/main/cpp/CMakeLists.txt
@@ -4,10 +4,6 @@ project(playintegrityfix)
 
 add_library(${CMAKE_PROJECT_NAME} SHARED main.cpp)
 
-find_package(cxx REQUIRED CONFIG)
-
-link_libraries(cxx::cxx)
-
 add_subdirectory(Dobby)
 
-target_link_libraries(${CMAKE_PROJECT_NAME} log dobby_static)
+target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE log dobby_static)