diff --git a/stub/.gitignore b/app/stub/.gitignore similarity index 100% rename from stub/.gitignore rename to app/stub/.gitignore diff --git a/stub/build.gradle.kts b/app/stub/build.gradle.kts similarity index 100% rename from stub/build.gradle.kts rename to app/stub/build.gradle.kts diff --git a/stub/proguard-rules.pro b/app/stub/proguard-rules.pro similarity index 100% rename from stub/proguard-rules.pro rename to app/stub/proguard-rules.pro diff --git a/stub/src/main/AndroidManifest.xml b/app/stub/src/main/AndroidManifest.xml similarity index 100% rename from stub/src/main/AndroidManifest.xml rename to app/stub/src/main/AndroidManifest.xml diff --git a/stub/src/main/java/com/topjohnwu/magisk/ClassLoaders.java b/app/stub/src/main/java/com/topjohnwu/magisk/ClassLoaders.java similarity index 100% rename from stub/src/main/java/com/topjohnwu/magisk/ClassLoaders.java rename to app/stub/src/main/java/com/topjohnwu/magisk/ClassLoaders.java diff --git a/stub/src/main/java/com/topjohnwu/magisk/DelegateApplication.java b/app/stub/src/main/java/com/topjohnwu/magisk/DelegateApplication.java similarity index 100% rename from stub/src/main/java/com/topjohnwu/magisk/DelegateApplication.java rename to app/stub/src/main/java/com/topjohnwu/magisk/DelegateApplication.java diff --git a/stub/src/main/java/com/topjohnwu/magisk/DelegateComponentFactory.java b/app/stub/src/main/java/com/topjohnwu/magisk/DelegateComponentFactory.java similarity index 100% rename from stub/src/main/java/com/topjohnwu/magisk/DelegateComponentFactory.java rename to app/stub/src/main/java/com/topjohnwu/magisk/DelegateComponentFactory.java diff --git a/stub/src/main/java/com/topjohnwu/magisk/DelegateRootService.java b/app/stub/src/main/java/com/topjohnwu/magisk/DelegateRootService.java similarity index 100% rename from stub/src/main/java/com/topjohnwu/magisk/DelegateRootService.java rename to app/stub/src/main/java/com/topjohnwu/magisk/DelegateRootService.java diff --git a/stub/src/main/java/com/topjohnwu/magisk/DownloadActivity.java b/app/stub/src/main/java/com/topjohnwu/magisk/DownloadActivity.java similarity index 100% rename from stub/src/main/java/com/topjohnwu/magisk/DownloadActivity.java rename to app/stub/src/main/java/com/topjohnwu/magisk/DownloadActivity.java diff --git a/stub/src/main/java/com/topjohnwu/magisk/DynLoad.java b/app/stub/src/main/java/com/topjohnwu/magisk/DynLoad.java similarity index 100% rename from stub/src/main/java/com/topjohnwu/magisk/DynLoad.java rename to app/stub/src/main/java/com/topjohnwu/magisk/DynLoad.java diff --git a/stub/src/main/java/com/topjohnwu/magisk/dummy/DummyProvider.java b/app/stub/src/main/java/com/topjohnwu/magisk/dummy/DummyProvider.java similarity index 100% rename from stub/src/main/java/com/topjohnwu/magisk/dummy/DummyProvider.java rename to app/stub/src/main/java/com/topjohnwu/magisk/dummy/DummyProvider.java diff --git a/stub/src/main/java/com/topjohnwu/magisk/dummy/DummyReceiver.java b/app/stub/src/main/java/com/topjohnwu/magisk/dummy/DummyReceiver.java similarity index 100% rename from stub/src/main/java/com/topjohnwu/magisk/dummy/DummyReceiver.java rename to app/stub/src/main/java/com/topjohnwu/magisk/dummy/DummyReceiver.java diff --git a/stub/src/main/java/com/topjohnwu/magisk/dummy/DummyService.java b/app/stub/src/main/java/com/topjohnwu/magisk/dummy/DummyService.java similarity index 100% rename from stub/src/main/java/com/topjohnwu/magisk/dummy/DummyService.java rename to app/stub/src/main/java/com/topjohnwu/magisk/dummy/DummyService.java diff --git a/stub/src/main/java/com/topjohnwu/magisk/net/BadRequest.java b/app/stub/src/main/java/com/topjohnwu/magisk/net/BadRequest.java similarity index 100% rename from stub/src/main/java/com/topjohnwu/magisk/net/BadRequest.java rename to app/stub/src/main/java/com/topjohnwu/magisk/net/BadRequest.java diff --git a/stub/src/main/java/com/topjohnwu/magisk/net/ErrorHandler.java b/app/stub/src/main/java/com/topjohnwu/magisk/net/ErrorHandler.java similarity index 100% rename from stub/src/main/java/com/topjohnwu/magisk/net/ErrorHandler.java rename to app/stub/src/main/java/com/topjohnwu/magisk/net/ErrorHandler.java diff --git a/stub/src/main/java/com/topjohnwu/magisk/net/Networking.java b/app/stub/src/main/java/com/topjohnwu/magisk/net/Networking.java similarity index 100% rename from stub/src/main/java/com/topjohnwu/magisk/net/Networking.java rename to app/stub/src/main/java/com/topjohnwu/magisk/net/Networking.java diff --git a/stub/src/main/java/com/topjohnwu/magisk/net/Request.java b/app/stub/src/main/java/com/topjohnwu/magisk/net/Request.java similarity index 100% rename from stub/src/main/java/com/topjohnwu/magisk/net/Request.java rename to app/stub/src/main/java/com/topjohnwu/magisk/net/Request.java diff --git a/stub/src/main/java/com/topjohnwu/magisk/net/ResponseListener.java b/app/stub/src/main/java/com/topjohnwu/magisk/net/ResponseListener.java similarity index 100% rename from stub/src/main/java/com/topjohnwu/magisk/net/ResponseListener.java rename to app/stub/src/main/java/com/topjohnwu/magisk/net/ResponseListener.java diff --git a/stub/src/main/res/values-ar/strings.xml b/app/stub/src/main/res/values-ar/strings.xml similarity index 100% rename from stub/src/main/res/values-ar/strings.xml rename to app/stub/src/main/res/values-ar/strings.xml diff --git a/stub/src/main/res/values-ast/strings.xml b/app/stub/src/main/res/values-ast/strings.xml similarity index 100% rename from stub/src/main/res/values-ast/strings.xml rename to app/stub/src/main/res/values-ast/strings.xml diff --git a/stub/src/main/res/values-az/strings.xml b/app/stub/src/main/res/values-az/strings.xml similarity index 100% rename from stub/src/main/res/values-az/strings.xml rename to app/stub/src/main/res/values-az/strings.xml diff --git a/stub/src/main/res/values-be/strings.xml b/app/stub/src/main/res/values-be/strings.xml similarity index 100% rename from stub/src/main/res/values-be/strings.xml rename to app/stub/src/main/res/values-be/strings.xml diff --git a/stub/src/main/res/values-bg/strings.xml b/app/stub/src/main/res/values-bg/strings.xml similarity index 100% rename from stub/src/main/res/values-bg/strings.xml rename to app/stub/src/main/res/values-bg/strings.xml diff --git a/stub/src/main/res/values-ca/strings.xml b/app/stub/src/main/res/values-ca/strings.xml similarity index 100% rename from stub/src/main/res/values-ca/strings.xml rename to app/stub/src/main/res/values-ca/strings.xml diff --git a/stub/src/main/res/values-cs/strings.xml b/app/stub/src/main/res/values-cs/strings.xml similarity index 100% rename from stub/src/main/res/values-cs/strings.xml rename to app/stub/src/main/res/values-cs/strings.xml diff --git a/stub/src/main/res/values-de/strings.xml b/app/stub/src/main/res/values-de/strings.xml similarity index 100% rename from stub/src/main/res/values-de/strings.xml rename to app/stub/src/main/res/values-de/strings.xml diff --git a/stub/src/main/res/values-el/strings.xml b/app/stub/src/main/res/values-el/strings.xml similarity index 100% rename from stub/src/main/res/values-el/strings.xml rename to app/stub/src/main/res/values-el/strings.xml diff --git a/stub/src/main/res/values-es/strings.xml b/app/stub/src/main/res/values-es/strings.xml similarity index 100% rename from stub/src/main/res/values-es/strings.xml rename to app/stub/src/main/res/values-es/strings.xml diff --git a/stub/src/main/res/values-et/strings.xml b/app/stub/src/main/res/values-et/strings.xml similarity index 100% rename from stub/src/main/res/values-et/strings.xml rename to app/stub/src/main/res/values-et/strings.xml diff --git a/stub/src/main/res/values-fa/strings.xml b/app/stub/src/main/res/values-fa/strings.xml similarity index 100% rename from stub/src/main/res/values-fa/strings.xml rename to app/stub/src/main/res/values-fa/strings.xml diff --git a/stub/src/main/res/values-fr/strings.xml b/app/stub/src/main/res/values-fr/strings.xml similarity index 100% rename from stub/src/main/res/values-fr/strings.xml rename to app/stub/src/main/res/values-fr/strings.xml diff --git a/stub/src/main/res/values-hi/strings.xml b/app/stub/src/main/res/values-hi/strings.xml similarity index 100% rename from stub/src/main/res/values-hi/strings.xml rename to app/stub/src/main/res/values-hi/strings.xml diff --git a/stub/src/main/res/values-hr/strings.xml b/app/stub/src/main/res/values-hr/strings.xml similarity index 100% rename from stub/src/main/res/values-hr/strings.xml rename to app/stub/src/main/res/values-hr/strings.xml diff --git a/stub/src/main/res/values-hu/strings.xml b/app/stub/src/main/res/values-hu/strings.xml similarity index 100% rename from stub/src/main/res/values-hu/strings.xml rename to app/stub/src/main/res/values-hu/strings.xml diff --git a/stub/src/main/res/values-in/strings.xml b/app/stub/src/main/res/values-in/strings.xml similarity index 100% rename from stub/src/main/res/values-in/strings.xml rename to app/stub/src/main/res/values-in/strings.xml diff --git a/stub/src/main/res/values-it/strings.xml b/app/stub/src/main/res/values-it/strings.xml similarity index 100% rename from stub/src/main/res/values-it/strings.xml rename to app/stub/src/main/res/values-it/strings.xml diff --git a/stub/src/main/res/values-iw/strings.xml b/app/stub/src/main/res/values-iw/strings.xml similarity index 100% rename from stub/src/main/res/values-iw/strings.xml rename to app/stub/src/main/res/values-iw/strings.xml diff --git a/stub/src/main/res/values-ja/strings.xml b/app/stub/src/main/res/values-ja/strings.xml similarity index 100% rename from stub/src/main/res/values-ja/strings.xml rename to app/stub/src/main/res/values-ja/strings.xml diff --git a/stub/src/main/res/values-ka/strings.xml b/app/stub/src/main/res/values-ka/strings.xml similarity index 100% rename from stub/src/main/res/values-ka/strings.xml rename to app/stub/src/main/res/values-ka/strings.xml diff --git a/stub/src/main/res/values-kk/strings.xml b/app/stub/src/main/res/values-kk/strings.xml similarity index 100% rename from stub/src/main/res/values-kk/strings.xml rename to app/stub/src/main/res/values-kk/strings.xml diff --git a/stub/src/main/res/values-ko/strings.xml b/app/stub/src/main/res/values-ko/strings.xml similarity index 100% rename from stub/src/main/res/values-ko/strings.xml rename to app/stub/src/main/res/values-ko/strings.xml diff --git a/stub/src/main/res/values-lt/strings.xml b/app/stub/src/main/res/values-lt/strings.xml similarity index 100% rename from stub/src/main/res/values-lt/strings.xml rename to app/stub/src/main/res/values-lt/strings.xml diff --git a/stub/src/main/res/values-mk/strings.xml b/app/stub/src/main/res/values-mk/strings.xml similarity index 100% rename from stub/src/main/res/values-mk/strings.xml rename to app/stub/src/main/res/values-mk/strings.xml diff --git a/stub/src/main/res/values-ml/strings.xml b/app/stub/src/main/res/values-ml/strings.xml similarity index 100% rename from stub/src/main/res/values-ml/strings.xml rename to app/stub/src/main/res/values-ml/strings.xml diff --git a/stub/src/main/res/values-nb/strings.xml b/app/stub/src/main/res/values-nb/strings.xml similarity index 100% rename from stub/src/main/res/values-nb/strings.xml rename to app/stub/src/main/res/values-nb/strings.xml diff --git a/stub/src/main/res/values-nl/strings.xml b/app/stub/src/main/res/values-nl/strings.xml similarity index 100% rename from stub/src/main/res/values-nl/strings.xml rename to app/stub/src/main/res/values-nl/strings.xml diff --git a/stub/src/main/res/values-pa/strings.xml b/app/stub/src/main/res/values-pa/strings.xml similarity index 100% rename from stub/src/main/res/values-pa/strings.xml rename to app/stub/src/main/res/values-pa/strings.xml diff --git a/stub/src/main/res/values-pl/strings.xml b/app/stub/src/main/res/values-pl/strings.xml similarity index 100% rename from stub/src/main/res/values-pl/strings.xml rename to app/stub/src/main/res/values-pl/strings.xml diff --git a/stub/src/main/res/values-pt-rBR/strings.xml b/app/stub/src/main/res/values-pt-rBR/strings.xml similarity index 100% rename from stub/src/main/res/values-pt-rBR/strings.xml rename to app/stub/src/main/res/values-pt-rBR/strings.xml diff --git a/stub/src/main/res/values-pt-rPT/strings.xml b/app/stub/src/main/res/values-pt-rPT/strings.xml similarity index 100% rename from stub/src/main/res/values-pt-rPT/strings.xml rename to app/stub/src/main/res/values-pt-rPT/strings.xml diff --git a/stub/src/main/res/values-ro/strings.xml b/app/stub/src/main/res/values-ro/strings.xml similarity index 100% rename from stub/src/main/res/values-ro/strings.xml rename to app/stub/src/main/res/values-ro/strings.xml diff --git a/stub/src/main/res/values-ru/strings.xml b/app/stub/src/main/res/values-ru/strings.xml similarity index 100% rename from stub/src/main/res/values-ru/strings.xml rename to app/stub/src/main/res/values-ru/strings.xml diff --git a/stub/src/main/res/values-sk/strings.xml b/app/stub/src/main/res/values-sk/strings.xml similarity index 100% rename from stub/src/main/res/values-sk/strings.xml rename to app/stub/src/main/res/values-sk/strings.xml diff --git a/stub/src/main/res/values-sq/strings.xml b/app/stub/src/main/res/values-sq/strings.xml similarity index 100% rename from stub/src/main/res/values-sq/strings.xml rename to app/stub/src/main/res/values-sq/strings.xml diff --git a/stub/src/main/res/values-sr/strings.xml b/app/stub/src/main/res/values-sr/strings.xml similarity index 100% rename from stub/src/main/res/values-sr/strings.xml rename to app/stub/src/main/res/values-sr/strings.xml diff --git a/stub/src/main/res/values-sv/strings.xml b/app/stub/src/main/res/values-sv/strings.xml similarity index 100% rename from stub/src/main/res/values-sv/strings.xml rename to app/stub/src/main/res/values-sv/strings.xml diff --git a/stub/src/main/res/values-sw/strings.xml b/app/stub/src/main/res/values-sw/strings.xml similarity index 100% rename from stub/src/main/res/values-sw/strings.xml rename to app/stub/src/main/res/values-sw/strings.xml diff --git a/stub/src/main/res/values-ta/strings.xml b/app/stub/src/main/res/values-ta/strings.xml similarity index 100% rename from stub/src/main/res/values-ta/strings.xml rename to app/stub/src/main/res/values-ta/strings.xml diff --git a/stub/src/main/res/values-th/strings.xml b/app/stub/src/main/res/values-th/strings.xml similarity index 100% rename from stub/src/main/res/values-th/strings.xml rename to app/stub/src/main/res/values-th/strings.xml diff --git a/stub/src/main/res/values-tr/strings.xml b/app/stub/src/main/res/values-tr/strings.xml similarity index 100% rename from stub/src/main/res/values-tr/strings.xml rename to app/stub/src/main/res/values-tr/strings.xml diff --git a/stub/src/main/res/values-uk/strings.xml b/app/stub/src/main/res/values-uk/strings.xml similarity index 100% rename from stub/src/main/res/values-uk/strings.xml rename to app/stub/src/main/res/values-uk/strings.xml diff --git a/stub/src/main/res/values-vi/strings.xml b/app/stub/src/main/res/values-vi/strings.xml similarity index 100% rename from stub/src/main/res/values-vi/strings.xml rename to app/stub/src/main/res/values-vi/strings.xml diff --git a/stub/src/main/res/values-zh-rCN/strings.xml b/app/stub/src/main/res/values-zh-rCN/strings.xml similarity index 100% rename from stub/src/main/res/values-zh-rCN/strings.xml rename to app/stub/src/main/res/values-zh-rCN/strings.xml diff --git a/stub/src/main/res/values-zh-rTW/strings.xml b/app/stub/src/main/res/values-zh-rTW/strings.xml similarity index 100% rename from stub/src/main/res/values-zh-rTW/strings.xml rename to app/stub/src/main/res/values-zh-rTW/strings.xml diff --git a/stub/src/main/res/values/strings.xml b/app/stub/src/main/res/values/strings.xml similarity index 100% rename from stub/src/main/res/values/strings.xml rename to app/stub/src/main/res/values/strings.xml diff --git a/build.py b/build.py index ccc7adb15..e50c2e539 100755 --- a/build.py +++ b/build.py @@ -475,8 +475,10 @@ def build_apk(args, module): build_type = build_type.lower() - apk = f"{module}-{build_type}.apk" - source = Path(module, "build", "outputs", "apk", build_type, apk) + paths = module.split(":") + + apk = f"{paths[-1]}-{build_type}.apk" + source = Path(*paths, "build", "outputs", "apk", build_type, apk) target = config["outdir"] / apk mv(source, target) header(f"Output: {target}") @@ -484,7 +486,7 @@ def build_apk(args, module): def build_app(args): header("* Building the Magisk app") - build_apk(args, "app") + build_apk(args, ":app") # Stub building is directly integrated into the main app # build process. Copy the stub APK into output directory. @@ -497,7 +499,7 @@ def build_app(args): def build_stub(args): header("* Building the stub app") - build_apk(args, "stub") + build_apk(args, ":app:stub") def cleanup(args): @@ -527,11 +529,15 @@ def cleanup(args): if "java" in args.target: header("* Cleaning java") execv( - [gradlew, "app:clean", "app:core:clean", "app:shared:clean", "stub:clean"], + [ + gradlew, + ":app:clean", + ":app:core:clean", + ":app:shared:clean", + ":app:stub:clean", + ], env=find_jdk(), ) - rm_rf(Path("app", "src", "debug")) - rm_rf(Path("app", "src", "release")) def setup_ndk(args): diff --git a/buildSrc/src/main/java/Setup.kt b/buildSrc/src/main/java/Setup.kt index 2930d6fa2..2b8c3c395 100644 --- a/buildSrc/src/main/java/Setup.kt +++ b/buildSrc/src/main/java/Setup.kt @@ -148,7 +148,7 @@ fun Project.setupCoreLib() { tasks.getByPath("merge${variantCapped}JniLibFolders").dependsOn(syncLibs) processJavaResourcesProvider.configure { dependsOn(syncResources) } - val stubTask = tasks.getByPath(":stub:comment$variantCapped") + val stubTask = tasks.getByPath(":app:stub:comment$variantCapped") val stubApk = stubTask.outputs.files.asFileTree.filter { it.name.endsWith(".apk") } diff --git a/settings.gradle.kts b/settings.gradle.kts index f7af40c54..2a66abe2a 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -8,4 +8,4 @@ dependencyResolutionManagement { } } rootProject.name = "Magisk" -include(":app", ":app:core", ":app:shared", ":native", ":stub") +include(":app", ":app:core", ":app:shared", ":app:stub", ":native")