From 06650368b0283c1cb6af790f515f5d4d9fef5080 Mon Sep 17 00:00:00 2001
From: Nullptr <noreply@nullptr.icu>
Date: Mon, 30 Jan 2023 10:25:55 +0800
Subject: [PATCH] Update build

---
 build.gradle.kts                    | 19 ++++++-------------
 loader/build.gradle.kts             |  2 ++
 module/build.gradle.kts             | 11 ++++++-----
 module/src/main/AndroidManifest.xml |  1 -
 zygiskd/build.gradle.kts            |  6 ++++++
 5 files changed, 20 insertions(+), 19 deletions(-)
 delete mode 100644 module/src/main/AndroidManifest.xml

diff --git a/build.gradle.kts b/build.gradle.kts
index fb420b0..1a83059 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,5 +1,4 @@
-import com.android.build.api.dsl.ApplicationExtension
-import com.android.build.gradle.BaseExtension
+import com.android.build.gradle.LibraryExtension
 
 plugins {
     id("com.android.application") apply false
@@ -30,30 +29,24 @@ tasks.register("Delete", Delete::class) {
 }
 
 fun Project.configureBaseExtension() {
-    extensions.findByType(BaseExtension::class)?.run {
+    extensions.findByType(LibraryExtension::class)?.run {
         namespace = "icu.nullptr.zygisksu"
-        compileSdkVersion(androidCompileSdkVersion)
+        compileSdk = androidCompileSdkVersion
         ndkVersion = androidCompileNdkVersion
         buildToolsVersion = androidBuildToolsVersion
 
         defaultConfig {
             minSdk = androidMinSdkVersion
             targetSdk = androidTargetSdkVersion
-            versionCode = verCode
-            versionName = verName
         }
-    }
 
-    extensions.findByType(ApplicationExtension::class)?.lint {
-        abortOnError = true
-        checkReleaseBuilds = false
+        lint {
+            abortOnError = true
+        }
     }
 }
 
 subprojects {
-    plugins.withId("com.android.application") {
-        configureBaseExtension()
-    }
     plugins.withId("com.android.library") {
         configureBaseExtension()
     }
diff --git a/loader/build.gradle.kts b/loader/build.gradle.kts
index f05a864..39d6b0b 100644
--- a/loader/build.gradle.kts
+++ b/loader/build.gradle.kts
@@ -4,6 +4,8 @@ plugins {
 
 android {
     buildFeatures {
+        androidResources = false
+        buildConfig = false
         prefab = true
     }
 
diff --git a/module/build.gradle.kts b/module/build.gradle.kts
index f04210f..3fda932 100644
--- a/module/build.gradle.kts
+++ b/module/build.gradle.kts
@@ -1,10 +1,11 @@
 plugins {
-    id("com.android.application")
+    id("com.android.library")
 }
 
-val moduleName = "Zygisk On KernelSU"
-val moduleBaseId = "zygisksu"
-val authors = "Nullptr"
-
 val verCode: Int by rootProject.extra
 val verName: String by rootProject.extra
+
+android.buildFeatures {
+    androidResources = false
+    buildConfig = false
+}
diff --git a/module/src/main/AndroidManifest.xml b/module/src/main/AndroidManifest.xml
deleted file mode 100644
index 9b65eb0..0000000
--- a/module/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1 +0,0 @@
-<manifest/>
diff --git a/zygiskd/build.gradle.kts b/zygiskd/build.gradle.kts
index a160cea..f689bd6 100644
--- a/zygiskd/build.gradle.kts
+++ b/zygiskd/build.gradle.kts
@@ -3,11 +3,17 @@ plugins {
     id("org.mozilla.rust-android-gradle.rust-android")
 }
 
+android.buildFeatures {
+    androidResources = false
+    buildConfig = false
+}
+
 cargo {
     module = "."
     libname = "zygiskd"
     targetIncludes = arrayOf("zygiskd")
     targets = listOf("arm64", "arm", "x86", "x86_64")
+    targetDirectory = "build/intermediates/rust"
     val isDebug = gradle.startParameter.taskNames.any { it.toLowerCase().contains("debug") }
     profile = if (isDebug) "debug" else "release"
 }