v15.9.3

chiteroman · Mar 2, 2024 · 10189ee · 10189ee
1 parent c0d0e42
commit 10189ee
Show file tree

Hide file tree

Showing 343 changed files with 26,081 additions and 16,188 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -12,8 +12,8 @@ android {
         applicationId = "es.chiteroman.playintegrityfix"
         minSdk = 26
         targetSdk = 34
-        versionCode = 15920
-        versionName = "v15.9.2"
+        versionCode = 15930
+        versionName = "v15.9.3"
         multiDexEnabled = false
 
         buildFeatures {
@@ -24,29 +24,23 @@ android {
             jniLibs {
                 excludes += "**/liblog.so"
                 excludes += "**/libdobby.so"
-                excludes += "**/libshadowhook.so"
             }
         }
 
         externalNativeBuild {
             cmake {
-                abiFilters += "arm64-v8a"
-                abiFilters += "armeabi-v7a"
-
                 arguments += "-DANDROID_STL=none"
                 arguments += "-DCMAKE_BUILD_TYPE=MinSizeRel"
 
                 cFlags += "-std=c2x"
                 cFlags += "-fvisibility=hidden"
                 cFlags += "-fvisibility-inlines-hidden"
-                cFlags += "-flto"
 
                 cppFlags += "-std=c++2b"
                 cppFlags += "-fno-exceptions"
                 cppFlags += "-fno-rtti"
                 cppFlags += "-fvisibility=hidden"
                 cppFlags += "-fvisibility-inlines-hidden"
-                cppFlags += "-flto"
             }
         }
     }

diff --git a/app/src/main/cpp/CMakeLists.txt b/app/src/main/cpp/CMakeLists.txt
@@ -2,18 +2,12 @@ cmake_minimum_required(VERSION 3.22.1)
 
 project(playintegrityfix)
 
-find_package(cxx REQUIRED CONFIG)
-
-if (${ANDROID_ABI} STREQUAL "arm64-v8a")
-    set(ARCH "arm64")
-elseif (${ANDROID_ABI} STREQUAL "armeabi-v7a")
-    set(ARCH "arm")
-endif ()
+add_library(${CMAKE_PROJECT_NAME} SHARED main.cpp)
 
-file(GLOB shadowhook_src shadowhook/*.c shadowhook/arch/${ARCH}/*.c shadowhook/common/*.c shadowhook/third_party/*/*.c)
+find_package(cxx REQUIRED CONFIG)
 
-add_library(${CMAKE_PROJECT_NAME} SHARED main.cpp ${shadowhook_src})
+link_libraries(cxx::cxx)
 
-target_include_directories(${CMAKE_PROJECT_NAME} PRIVATE . shadowhook shadowhook/include shadowhook/arch/${ARCH} shadowhook/common shadowhook/third_party/xdl shadowhook/third_party/bsd shadowhook/third_party/lss)
+add_subdirectory(Dobby)
 
-target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE log cxx::cxx)
+target_link_libraries(${CMAKE_PROJECT_NAME} log dobby_static)
diff --git a/app/src/main/cpp/Dobby/.clang-format b/app/src/main/cpp/Dobby/.clang-format
@@ -0,0 +1,18 @@
+BasedOnStyle: LLVM
+
+IndentWidth: 2
+TabWidth: 2
+UseTab: Never
+ColumnLimit: 120
+
+FixNamespaceComments: true
+
+# default is false
+#AlignConsecutiveMacros: true
+#AlignConsecutiveAssignments: true
+#AlignConsecutiveDeclarations: true
+
+# default is true
+ReflowComments: false
+SortIncludes : false
+AllowShortFunctionsOnASingleLine: false
diff --git a/app/src/main/cpp/Dobby/.gitignore b/app/src/main/cpp/Dobby/.gitignore
@@ -0,0 +1,80 @@
+.DS_Store
+.idea/
+*-build*/
+build-output/
+
+CMakeLists.txt.user
+CMakeCache.txt
+CMakeFiles
+CMakeScripts
+Testing
+Makefile
+cmake_install.cmake
+install_manifest.txt
+compile_commands.json
+CTestTestfile.cmake
+_deps
+
+## Build generated
+build/
+DerivedData/
+
+## Various settings
+*.pbxuser
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+xcuserdata/
+
+## Other
+*.moved-aside
+*.xccheckout
+*.xcscmblueprint
+
+## Obj-C/Swift specific
+*.hmap
+*.ipa
+*.dSYM.zip
+*.dSYM
+
+# Prerequisites
+*.d
+
+# Compiled Object files
+*.slo
+*.lo
+*.o
+*.obj
+
+# Precompiled Headers
+*.gch
+*.pch
+
+# Compiled Dynamic libraries
+*.so
+*.dylib
+*.dll
+
+# Fortran module files
+*.mod
+*.smod
+
+# Compiled Static libraries
+*.lai
+*.la
+*.a
+*.lib
+
+# Executables
+*.exe
+*.out
+*.app
+
+# Prefab
+/prefab/**/*.a
+/prefab/**/*.h
+/AndroidManifest.xml