From 84eacc010ff5040b30d5c31de3994c59a839e2c6 Mon Sep 17 00:00:00 2001 From: 327135569 Date: Thu, 8 Apr 2021 10:32:35 +0800 Subject: [PATCH] merge loader into app --- app/build.gradle | 1 - .../main/java/android/app/ActivityThread.java | 0 .../src/main/java/android/app/LoadedApk.java | 0 .../content/res/CompatibilityInfo.java | 0 .../com/wind/xposed/entry/MMPApplication.java | 0 .../java/com/wind/xposed/entry/MMPLoader.java | 0 .../com/wind/xposed/entry/util/FileUtils.java | 0 .../xposed/entry/util/ReflectionApiCheck.java | 0 .../java/com/wind/xposed/entry/util/XLog.java | 3 +- .../wind/xposed/entry/util/XpatchUtils.java | 0 .../de/robv/android/xposed/XposedHelper.java | 0 loader/.gitignore | 1 - loader/build.gradle | 29 ------------------- loader/proguard-rules.pro | 16 ---------- loader/src/main/AndroidManifest.xml | 10 ------- loader/src/main/res/values/strings.xml | 3 -- settings.gradle | 1 - 17 files changed, 2 insertions(+), 62 deletions(-) rename {loader => app}/src/main/java/android/app/ActivityThread.java (100%) rename {loader => app}/src/main/java/android/app/LoadedApk.java (100%) rename {loader => app}/src/main/java/android/content/res/CompatibilityInfo.java (100%) rename {loader => app}/src/main/java/com/wind/xposed/entry/MMPApplication.java (100%) rename {loader => app}/src/main/java/com/wind/xposed/entry/MMPLoader.java (100%) rename {loader => app}/src/main/java/com/wind/xposed/entry/util/FileUtils.java (100%) rename {loader => app}/src/main/java/com/wind/xposed/entry/util/ReflectionApiCheck.java (100%) rename {loader => app}/src/main/java/com/wind/xposed/entry/util/XLog.java (95%) rename {loader => app}/src/main/java/com/wind/xposed/entry/util/XpatchUtils.java (100%) rename {loader => app}/src/main/java/de/robv/android/xposed/XposedHelper.java (100%) delete mode 100644 loader/.gitignore delete mode 100644 loader/build.gradle delete mode 100644 loader/proguard-rules.pro delete mode 100644 loader/src/main/AndroidManifest.xml delete mode 100644 loader/src/main/res/values/strings.xml diff --git a/app/build.gradle b/app/build.gradle index 0710a65..b6248af 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -65,7 +65,6 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation project(':loader') implementation("androidx.core:core:1.3.2") implementation project(path: ':lspcore') } diff --git a/loader/src/main/java/android/app/ActivityThread.java b/app/src/main/java/android/app/ActivityThread.java similarity index 100% rename from loader/src/main/java/android/app/ActivityThread.java rename to app/src/main/java/android/app/ActivityThread.java diff --git a/loader/src/main/java/android/app/LoadedApk.java b/app/src/main/java/android/app/LoadedApk.java similarity index 100% rename from loader/src/main/java/android/app/LoadedApk.java rename to app/src/main/java/android/app/LoadedApk.java diff --git a/loader/src/main/java/android/content/res/CompatibilityInfo.java b/app/src/main/java/android/content/res/CompatibilityInfo.java similarity index 100% rename from loader/src/main/java/android/content/res/CompatibilityInfo.java rename to app/src/main/java/android/content/res/CompatibilityInfo.java diff --git a/loader/src/main/java/com/wind/xposed/entry/MMPApplication.java b/app/src/main/java/com/wind/xposed/entry/MMPApplication.java similarity index 100% rename from loader/src/main/java/com/wind/xposed/entry/MMPApplication.java rename to app/src/main/java/com/wind/xposed/entry/MMPApplication.java diff --git a/loader/src/main/java/com/wind/xposed/entry/MMPLoader.java b/app/src/main/java/com/wind/xposed/entry/MMPLoader.java similarity index 100% rename from loader/src/main/java/com/wind/xposed/entry/MMPLoader.java rename to app/src/main/java/com/wind/xposed/entry/MMPLoader.java diff --git a/loader/src/main/java/com/wind/xposed/entry/util/FileUtils.java b/app/src/main/java/com/wind/xposed/entry/util/FileUtils.java similarity index 100% rename from loader/src/main/java/com/wind/xposed/entry/util/FileUtils.java rename to app/src/main/java/com/wind/xposed/entry/util/FileUtils.java diff --git a/loader/src/main/java/com/wind/xposed/entry/util/ReflectionApiCheck.java b/app/src/main/java/com/wind/xposed/entry/util/ReflectionApiCheck.java similarity index 100% rename from loader/src/main/java/com/wind/xposed/entry/util/ReflectionApiCheck.java rename to app/src/main/java/com/wind/xposed/entry/util/ReflectionApiCheck.java diff --git a/loader/src/main/java/com/wind/xposed/entry/util/XLog.java b/app/src/main/java/com/wind/xposed/entry/util/XLog.java similarity index 95% rename from loader/src/main/java/com/wind/xposed/entry/util/XLog.java rename to app/src/main/java/com/wind/xposed/entry/util/XLog.java index d5d4d4b..113575f 100644 --- a/loader/src/main/java/com/wind/xposed/entry/util/XLog.java +++ b/app/src/main/java/com/wind/xposed/entry/util/XLog.java @@ -1,6 +1,7 @@ package com.wind.xposed.entry.util; -import com.wind.xposed.entry.BuildConfig; + +import com.storm.wind.xposed.BuildConfig; public class XLog { diff --git a/loader/src/main/java/com/wind/xposed/entry/util/XpatchUtils.java b/app/src/main/java/com/wind/xposed/entry/util/XpatchUtils.java similarity index 100% rename from loader/src/main/java/com/wind/xposed/entry/util/XpatchUtils.java rename to app/src/main/java/com/wind/xposed/entry/util/XpatchUtils.java diff --git a/loader/src/main/java/de/robv/android/xposed/XposedHelper.java b/app/src/main/java/de/robv/android/xposed/XposedHelper.java similarity index 100% rename from loader/src/main/java/de/robv/android/xposed/XposedHelper.java rename to app/src/main/java/de/robv/android/xposed/XposedHelper.java diff --git a/loader/.gitignore b/loader/.gitignore deleted file mode 100644 index 796b96d..0000000 --- a/loader/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build diff --git a/loader/build.gradle b/loader/build.gradle deleted file mode 100644 index fe502dd..0000000 --- a/loader/build.gradle +++ /dev/null @@ -1,29 +0,0 @@ -apply plugin: 'com.android.library' - -android { - compileSdkVersion 30 - - defaultConfig { - minSdkVersion rootProject.ext.androidMinSdkVersion - targetSdkVersion rootProject.ext.androidTargetSdkVersion - versionCode 1 - versionName "1.0" - } - buildTypes { - debug { - debuggable true - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - } - release { - debuggable false - minifyEnabled true - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - } - } -} - -dependencies { - implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation project(':lspcore') -} \ No newline at end of file diff --git a/loader/proguard-rules.pro b/loader/proguard-rules.pro deleted file mode 100644 index 6045eb7..0000000 --- a/loader/proguard-rules.pro +++ /dev/null @@ -1,16 +0,0 @@ -#-keep class com.wind.xposed.entry.XposedModuleEntry { -# public (); -# public void init(); -#} -#-keep class de.robv.android.xposed.**{*;} -#-keep class com.swift.sandhook.**{*;} -#-keep class com.swift.sandhook.xposedcompat.**{*;} -# -#-dontwarn de.robv.android.xposed.XposedHelper --keep class com.wind.xposed.entry.MMPEntry { - public (); - public void initAndLoadModules(); -} --keep class de.robv.android.xposed.**{*;} - --dontwarn de.robv.android.xposed.XposedHelper \ No newline at end of file diff --git a/loader/src/main/AndroidManifest.xml b/loader/src/main/AndroidManifest.xml deleted file mode 100644 index e3574ff..0000000 --- a/loader/src/main/AndroidManifest.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - diff --git a/loader/src/main/res/values/strings.xml b/loader/src/main/res/values/strings.xml deleted file mode 100644 index 49fc91e..0000000 --- a/loader/src/main/res/values/strings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - library - diff --git a/settings.gradle b/settings.gradle index c27b52b..79f0fa0 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,6 +1,5 @@ include ':app' rootProject.name='MMPLoader' -include ':loader' include ':lspcore' project(':lspcore').projectDir = new File('mmp/core') include ':hiddenapi-stubs'