Use dobby prefab (LSPosed#361)

rigza · Mar 15, 2021 · b7c18eb · b7c18eb
1 parent 8813122
commit b7c18eb
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 20 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,6 +1,3 @@
-[submodule "core/src/main/cpp/external/Dobby"]
-	path = core/src/main/cpp/external/Dobby
-	url = https://github.com/jmpews/Dobby.git
 [submodule "service"]
 	path = service
 	url = https://github.com/Xposed-Modules-Repo/XposedService.git

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -67,7 +67,7 @@ android {
         disable += "MissingTranslation"
         disable += "ExtraTranslation"
         isAbortOnError = true
-        isCheckReleaseBuilds = true
+        isCheckReleaseBuilds = false
     }
 
     packagingOptions {

diff --git a/core/.gitignore b/core/.gitignore
@@ -1,6 +1,5 @@
 /.externalNativeBuild
 /build
-/libs
 /obj
 /release
 /template_override/module.prop

diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -64,6 +64,7 @@ val verName: String by rootProject.extra
 
 dependencies {
     implementation("dev.rikka.ndk:riru:24.0.0")
+    implementation(files("libs/dobby_prefab.aar"))
     implementation("com.android.tools.build:apksig:4.1.2")
     compileOnly(project(":hiddenapi-stubs"))
     compileOnly("androidx.annotation:annotation:1.1.0")

diff --git a/core/libs/dobby_prefab.aar b/core/libs/dobby_prefab.aar
diff --git a/core/src/main/cpp/external/CMakeLists.txt b/core/src/main/cpp/external/CMakeLists.txt
@@ -2,18 +2,5 @@ cmake_minimum_required(VERSION 3.4.1)
 
 add_subdirectory(yahfa)
 
-macro(SET_OPTION option value)
-    set(${option} ${value} CACHE INTERNAL "" FORCE)
-endmacro()
-
-SET_OPTION(DOBBY_GENERATE_SHARED OFF)
-SET_OPTION(Plugin.Android.BionicLinkerRestriction ON)
-if (NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
-    SET_OPTION(DOBBY_DEBUG OFF)
-endif (NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
-add_subdirectory(Dobby)
-target_include_directories(dobby PUBLIC Dobby/include)
-target_include_directories(dobby PUBLIC Dobby/builtin-plugin/BionicLinkerRestriction)
-
 add_subdirectory(DexBuilder)
 target_include_directories(dex_builder PUBLIC DexBuilder)
diff --git a/core/src/main/cpp/external/Dobby b/core/src/main/cpp/external/Dobby
diff --git a/core/src/main/cpp/main/CMakeLists.txt b/core/src/main/cpp/main/CMakeLists.txt
@@ -28,5 +28,6 @@ add_executable(lspd ${SRC_LIST} ${SRC_JNI_LIST})
 SET(CMAKE_EXE_LINKER_FLAGS  "${CMAKE_EXE_LINKER_FLAGS} -Wl,--dynamic-list=${CMAKE_SOURCE_DIR}/dynamic_list")
 
 find_package(riru REQUIRED CONFIG)
+find_package(dobby REQUIRED CONFIG)
 find_library(log-lib log)
-target_link_libraries(lspd yahfa riru::riru android dobby dex_builder ${log-lib})
+target_link_libraries(lspd yahfa riru::riru android dobby::dobby dex_builder ${log-lib})