Use dobby prefab (#361)

This commit is contained in:
vvb2060 2021-03-15 17:12:24 +08:00 committed by GitHub
parent 8813122186
commit b7c18eb12c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 4 additions and 20 deletions

3
.gitmodules vendored
View File

@ -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

View File

@ -67,7 +67,7 @@ android {
disable += "MissingTranslation"
disable += "ExtraTranslation"
isAbortOnError = true
isCheckReleaseBuilds = true
isCheckReleaseBuilds = false
}
packagingOptions {

1
core/.gitignore vendored
View File

@ -1,6 +1,5 @@
/.externalNativeBuild
/build
/libs
/obj
/release
/template_override/module.prop

View File

@ -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")

BIN
core/libs/dobby_prefab.aar Normal file

Binary file not shown.

View File

@ -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)

@ -1 +0,0 @@
Subproject commit 782727f269d4776ccfe6b27d1e310c0001c9f6ea

View File

@ -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})