Use axml (ManifestEditor) lib from LSPosed

By doing so, we no longer need org.slf4j.* classes ManifestEditor will now check atrribute types, so we choose correctly the type of minSdkVersion.
JingMatrix · May 18, 2024 · 4a7cc25 · 4a7cc25
1 parent cddf811
commit 4a7cc25
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 6 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -6,6 +6,3 @@
 	path = core
 	url = https://github.com/JingMatrix/LSPosed.git
 	branch = master
-[submodule "patch/libs/manifest-editor"]
-	path = patch/libs/manifest-editor
-	url = https://github.com/WindySha/ManifestEditor.git
diff --git a/core b/core
diff --git a/patch/build.gradle.kts b/patch/build.gradle.kts
@@ -17,6 +17,7 @@ java {
 }
 
 dependencies {
+    implementation(projects.axml)
     implementation(projects.apkzlib)
     implementation(projects.share.java)
 

diff --git a/patch/libs/manifest-editor b/patch/libs/manifest-editor
diff --git a/patch/src/main/java/org/lsposed/patch/LSPatch.java b/patch/src/main/java/org/lsposed/patch/LSPatch.java
@@ -342,7 +342,7 @@ private byte[] modifyManifestFile(InputStream is, String metadata, int minSdkVer
         if (overrideVersionCode)
             property.addManifestAttribute(new AttributeItem(NodeValue.Manifest.VERSION_CODE, 1));
         if (minSdkVersion < 28)
-            property.addUsesSdkAttribute(new AttributeItem(NodeValue.UsesSDK.MIN_SDK_VERSION, "28"));
+            property.addUsesSdkAttribute(new AttributeItem(NodeValue.UsesSDK.MIN_SDK_VERSION, 28));
         property.addApplicationAttribute(new AttributeItem(NodeValue.Application.DEBUGGABLE, debuggableFlag));
         property.addApplicationAttribute(new AttributeItem("appComponentFactory", PROXY_APP_COMPONENT_FACTORY));
         property.addMetaData(new ModificationProperty.MetaData("lspatch", metadata));

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -33,6 +33,7 @@ rootProject.name = "LSPatch"
 include(
     ":apkzlib",
     ":core",
+    ":axml",
     ":hiddenapi:bridge",
     ":hiddenapi:stubs",
     ":jar",
@@ -48,6 +49,7 @@ include(
 )
 
 project(":core").projectDir = file("core/core")
+project(":axml").projectDir = file("core/axml")
 project(":hiddenapi:bridge").projectDir = file("core/hiddenapi/bridge")
 project(":hiddenapi:stubs").projectDir = file("core/hiddenapi/stubs")
 project(":services:daemon-service").projectDir = file("core/services/daemon-service")

diff --git a/share/lspatch-rules.pro b/share/lspatch-rules.pro
@@ -5,5 +5,6 @@
 -keepnames class org.lsposed.lspd.impl.LSPosedHookCallback
 -keepnames class org.lsposed.lspd.util.Hookers
 -keepnames class org.lsposed.lspd.util.LspModuleClassLoader
+-keepnames class org.lsposed.lspd.util.MetaDataReader
 
 -keepattributes SourceFile,LineNumberTable
+4 −1		.gitmodules
+1 −0		axml/.gitignore
+17 −0		axml/build.gradle.kts
+1 −0		axml/libs/manifest-editor
+1 −1		build.gradle.kts
+1 −1		core/build.gradle.kts
+0 −1		core/proguard-rules.pro
+2 −1		core/src/main/jni/CMakeLists.txt
+8 −0		core/src/main/jni/include/elf_util.h
+452 −0		core/src/main/jni/include/xz/xz.h
+129 −0		core/src/main/jni/include/xz/xz_config.h
+204 −0		core/src/main/jni/include/xz/xz_lzma2.h
+162 −0		core/src/main/jni/include/xz/xz_private.h
+62 −0		core/src/main/jni/include/xz/xz_stream.h
+133 −9		core/src/main/jni/src/elf_util.cpp
+59 −0		core/src/main/jni/src/xz/xz_crc32.c
+54 −0		core/src/main/jni/src/xz/xz_crc64.c
+622 −0		core/src/main/jni/src/xz/xz_dec_bcj.c
+1,344 −0		core/src/main/jni/src/xz/xz_dec_lzma2.c
+941 −0		core/src/main/jni/src/xz/xz_dec_stream.c
+1 −1		daemon/src/main/jni/CMakeLists.txt
+1 −1		dex2oat/src/main/cpp/CMakeLists.txt
+1 −0		external/CMakeLists.txt
+1 −1		external/fmt
+1 −1		external/lsplant
+0 −2		gradle.properties
+0 −1		gradle/libs.versions.toml
+0 −13		magisk-loader/build.gradle.kts
+0 −1		magisk-loader/proguard-rules.pro
+11 −1		magisk-loader/src/main/java/org/lsposed/lspd/util/ParasiticManagerHooker.java
+1 −1		magisk-loader/src/main/jni/CMakeLists.txt
+1 −0		settings.gradle.kts