From 4a7cc257a77cf48756c24bf13946bd2a8188be9a Mon Sep 17 00:00:00 2001
From: JingMatrix <jingmatrix@gmail.com>
Date: Sat, 18 May 2024 13:51:17 +0200
Subject: [PATCH] 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.
---
 .gitmodules                                        | 3 ---
 core                                               | 2 +-
 patch/build.gradle.kts                             | 1 +
 patch/libs/manifest-editor                         | 1 -
 patch/src/main/java/org/lsposed/patch/LSPatch.java | 2 +-
 settings.gradle.kts                                | 2 ++
 share/lspatch-rules.pro                            | 1 +
 7 files changed, 6 insertions(+), 6 deletions(-)
 delete mode 160000 patch/libs/manifest-editor

diff --git a/.gitmodules b/.gitmodules
index 554e947..145f02f 100644
--- 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
index 69f7390..1f80050 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit 69f73908ef82eaaac3d81e6274cbd625e2a5a418
+Subproject commit 1f80050e1dfc1a0f47202aa8d6c9c3e2b2bdc63d
diff --git a/patch/build.gradle.kts b/patch/build.gradle.kts
index 5a73ed8..b01611d 100644
--- 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
deleted file mode 160000
index 8133add..0000000
--- a/patch/libs/manifest-editor
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 8133add330141096033cc3e6bad48100c1148c11
diff --git a/patch/src/main/java/org/lsposed/patch/LSPatch.java b/patch/src/main/java/org/lsposed/patch/LSPatch.java
index 3585120..37e51ab 100644
--- a/patch/src/main/java/org/lsposed/patch/LSPatch.java
+++ b/patch/src/main/java/org/lsposed/patch/LSPatch.java
@@ -342,7 +342,7 @@ public class LSPatch {
         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
index a619ac2..3657cd5 100644
--- 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
index 07290b4..35eac33 100644
--- 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