From 8e96b8de218e1c080f06a74092d886e28675f8bd Mon Sep 17 00:00:00 2001
From: JingMatrix <jingmatrix@gmail.com>
Date: Sat, 18 May 2024 13:55:53 +0200
Subject: [PATCH] Replace axml by WindySha/ManifestEditor

---
 .gitmodules                      |  3 +++
 axml/.gitignore                  |  1 +
 axml/build.gradle.kts            | 17 +++++++++++++++++
 axml/libs/manifest-editor        |  1 +
 core/build.gradle.kts            |  2 +-
 core/proguard-rules.pro          |  1 -
 gradle/libs.versions.toml        |  1 -
 magisk-loader/proguard-rules.pro |  1 -
 settings.gradle.kts              |  1 +
 9 files changed, 24 insertions(+), 4 deletions(-)
 create mode 100644 axml/.gitignore
 create mode 100644 axml/build.gradle.kts
 create mode 160000 axml/libs/manifest-editor

diff --git a/.gitmodules b/.gitmodules
index 10165e6a..cab1ae3b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -10,3 +10,6 @@
 [submodule "external/cxx"]
 	path = external/cxx
 	url = https://github.com/topjohnwu/libcxx.git
+[submodule "patch/libs/manifest-editor"]
+    path = axml/libs/manifest-editor
+    url = https://github.com/WindySha/ManifestEditor.git
diff --git a/axml/.gitignore b/axml/.gitignore
new file mode 100644
index 00000000..42afabfd
--- /dev/null
+++ b/axml/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/axml/build.gradle.kts b/axml/build.gradle.kts
new file mode 100644
index 00000000..ca3c8958
--- /dev/null
+++ b/axml/build.gradle.kts
@@ -0,0 +1,17 @@
+val androidSourceCompatibility: JavaVersion by rootProject.extra
+val androidTargetCompatibility: JavaVersion by rootProject.extra
+
+plugins {
+    id("java-library")
+}
+
+java {
+    sourceCompatibility = androidSourceCompatibility
+    targetCompatibility = androidTargetCompatibility
+    sourceSets {
+        main {
+            java.srcDirs("libs/manifest-editor/lib/src/main/java")
+            resources.srcDirs("libs/manifest-editor/lib/src/main")
+        }
+    }
+}
diff --git a/axml/libs/manifest-editor b/axml/libs/manifest-editor
new file mode 160000
index 00000000..1eddf66b
--- /dev/null
+++ b/axml/libs/manifest-editor
@@ -0,0 +1 @@
+Subproject commit 1eddf66b8ef1a624cbbaae5584b9ad0d5b06fea8
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
index f165f33b..b199f3d7 100644
--- a/core/build.gradle.kts
+++ b/core/build.gradle.kts
@@ -58,7 +58,7 @@ copy {
 dependencies {
     api(libs.libxposed.api)
     implementation(libs.commons.lang3)
-    implementation(libs.axml)
+    implementation(projects.axml)
     implementation(projects.hiddenapi.bridge)
     implementation(projects.services.daemonService)
     implementation(projects.services.managerService)
diff --git a/core/proguard-rules.pro b/core/proguard-rules.pro
index 5d5bdd95..b521069c 100644
--- a/core/proguard-rules.pro
+++ b/core/proguard-rules.pro
@@ -26,4 +26,3 @@
 }
 -repackageclasses
 -allowaccessmodification
--dontwarn org.slf4j.impl.StaticLoggerBinder
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 070e4c9a..bf1652d3 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -56,7 +56,6 @@ okhttp-logging-interceptor = { group = "com.squareup.okhttp3", name = "logging-i
 
 agp-apksig = { group = "com.android.tools.build", name = "apksig", version.ref = "agp" }
 appiconloader = { module = "me.zhanghai.android.appiconloader:appiconloader", version = "1.5.0" }
-axml = { module = "de.upb.cs.swt:axml", version = "2.1.3" }
 commons-lang3 = { module = "org.apache.commons:commons-lang3", version = "3.14.0" }
 material = { module = "com.google.android.material:material", version = "1.11.0" }
 gson = { module = "com.google.code.gson:gson", version = "2.10.1" }
diff --git a/magisk-loader/proguard-rules.pro b/magisk-loader/proguard-rules.pro
index 8ce7c5e7..36e55739 100644
--- a/magisk-loader/proguard-rules.pro
+++ b/magisk-loader/proguard-rules.pro
@@ -14,6 +14,5 @@
 }
 -repackageclasses
 -allowaccessmodification
--dontwarn org.slf4j.impl.StaticLoggerBinder
 -dontwarn org.lsposed.lspd.core.*
 -dontwarn org.lsposed.lspd.util.Hookers
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 917fa289..f4cdaa47 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -27,6 +27,7 @@ dependencyResolutionManagement {
 rootProject.name = "LSPosed"
 include(
     ":app",
+    ":axml",
     ":core",
     ":daemon",
     ":dex2oat",