Tweak build configs and scripts

.run/fullApp.run.xml

@@ -1,59 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="fullApp" type="AndroidRunConfigurationType" factoryName="Android App" activateToolWindowBeforeRun="false">
-    <module name="Magisk.app" />
-    <option name="DEPLOY" value="true" />
-    <option name="DEPLOY_APK_FROM_BUNDLE" value="false" />
-    <option name="DEPLOY_AS_INSTANT" value="false" />
-    <option name="ARTIFACT_NAME" value="" />
-    <option name="PM_INSTALL_OPTIONS" value="" />
-    <option name="ALL_USERS" value="false" />
-    <option name="DYNAMIC_FEATURES_DISABLED_LIST" value="" />
-    <option name="ACTIVITY_EXTRA_FLAGS" value="" />
-    <option name="MODE" value="default_activity" />
-    <option name="CLEAR_LOGCAT" value="false" />
-    <option name="SHOW_LOGCAT_AUTOMATICALLY" value="false" />
-    <option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" />
-    <option name="FORCE_STOP_RUNNING_APP" value="true" />
-    <option name="TARGET_SELECTION_MODE" value="SHOW_DIALOG" />
-    <option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="-1" />
-    <option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />
-    <option name="DEBUGGER_TYPE" value="Java" />
-    <Auto>
-      <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
-      <option name="SHOW_STATIC_VARS" value="true" />
-      <option name="WORKING_DIR" value="" />
-      <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
-      <option name="SHOW_OPTIMIZED_WARNING" value="true" />
-    </Auto>
-    <Hybrid>
-      <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
-      <option name="SHOW_STATIC_VARS" value="true" />
-      <option name="WORKING_DIR" value="" />
-      <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
-      <option name="SHOW_OPTIMIZED_WARNING" value="true" />
-    </Hybrid>
-    <Java />
-    <Native>
-      <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
-      <option name="SHOW_STATIC_VARS" value="true" />
-      <option name="WORKING_DIR" value="" />
-      <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
-      <option name="SHOW_OPTIMIZED_WARNING" value="true" />
-    </Native>
-    <Profilers>
-      <option name="ADVANCED_PROFILING_ENABLED" value="false" />
-      <option name="STARTUP_PROFILING_ENABLED" value="false" />
-      <option name="STARTUP_CPU_PROFILING_ENABLED" value="false" />
-      <option name="STARTUP_CPU_PROFILING_CONFIGURATION_NAME" value="Sample Java Methods" />
-      <option name="STARTUP_NATIVE_MEMORY_PROFILING_ENABLED" value="false" />
-      <option name="NATIVE_MEMORY_SAMPLE_RATE_BYTES" value="2048" />
-    </Profilers>
-    <option name="DEEP_LINK" value="" />
-    <option name="ACTIVITY_CLASS" value="" />
-    <option name="SEARCH_ACTIVITY_IN_GLOBAL_SCOPE" value="false" />
-    <option name="SKIP_ACTIVITY_VALIDATION" value="false" />
-    <method v="2">
-      <option name="Gradle.BeforeRunTask" enabled="true" tasks="assembleDebug" externalProjectPath="$PROJECT_DIR$/app" vmOptions="" scriptParameters="" />
-    </method>
-  </configuration>
-</component>

README.MD

@@ -61,7 +61,6 @@ For Magisk Manager crashes, record and upload the logcat when the crash occurs.
 - To start building, run `build.py` to see your options. \
 For each action, use `-h` to access help (e.g. `./build.py all -h`)
 - To start development, open the project with Android Studio. The IDE can be used for both app (Kotlin/Java) and native (C++/C) sources.
-- Select the "appFull" run/debug configuration to run Magisk Manager via Android Studio. The default "app" config will not work.
 - Optionally, set custom configs with `config.prop`. A sample `config.prop.sample` is provided.
 - To sign APKs and zips with your own private keys, set signing configs in `config.prop`. For more info, check [Google's Documentation](https://developer.android.com/studio/publish/app-signing.html#generate-key).
 

app/build.gradle.kts

@@ -25,6 +25,7 @@ android {
         multiDexEnabled = true
         versionName = Config.version
         versionCode = Config.versionCode
+        ndk.abiFilters("armeabi-v7a", "arm64-v8a", "x86", "x86_64")
 
         javaCompileOptions.annotationProcessorOptions.arguments(
             mapOf("room.incremental" to "true")

buildSrc/src/main/java/BuildSource.kt

@@ -1,4 +1,4 @@
-import org.eclipse.jgit.api.Git
+
 import org.eclipse.jgit.internal.storage.file.FileRepository
 import org.gradle.api.Plugin
 import org.gradle.api.Project
@@ -7,8 +7,7 @@ import java.io.File
 import java.util.*
 
 private val props = Properties()
-private lateinit var commitHash: String
+private var commitHash = ""
-private var commitCount = 0
 
 object Config {
     operator fun get(key: String): String? {
@@ -24,16 +23,18 @@ object Config {
 }
 
 class MagiskPlugin : Plugin<Project> {
-    override fun apply(project: Project) {
+    override fun apply(project: Project) = project.applyPlugin()
-        project.rootProject.file("gradle.properties").inputStream().use { props.load(it) }
+
-        val configPath: String? by project
+    private fun Project.applyPlugin() {
-        val config = configPath?.let { File(it) } ?: project.rootProject.file("config.prop")
+        props.clear()
+        rootProject.file("gradle.properties").inputStream().use { props.load(it) }
+        val configPath: String? by this
+        val config = configPath?.let { File(it) } ?: rootProject.file("config.prop")
         if (config.exists())
             config.inputStream().use { props.load(it) }
 
-        val repo = FileRepository(project.rootProject.file(".git"))
+        val repo = FileRepository(rootProject.file(".git"))
         val refId = repo.refDatabase.exactRef("HEAD").objectId
         commitHash = repo.newObjectReader().abbreviate(refId, 8).name()
-        commitCount = Git(repo).log().add(refId).call().count()
     }
 }