Update build.gradle

build.gradle

@@ -141,26 +141,34 @@ android {
         versionName "${versionDisplayName}"
         buildConfigField "String", "VERSION_DISPLAY_NAME", "\"${versionDisplayName}\""
         buildConfigField "String", "MAJOR_VERSION", "\"${majorVersion}\""
-        buildConfigField "String", "COMMIT_HASH", "\"${buildCommit}\""
         buildConfigField "boolean", "ENABLE_AUTO_INSTALLS_LAYOUT", "false"
 
         manifestPlaceholders.quickstepMinSdk = quickstepMinSdk
         manifestPlaceholders.quickstepMaxSdk = quickstepMaxSdk
         buildConfigField "int", "QUICKSTEP_MIN_SDK", quickstepMinSdk
         buildConfigField "int", "QUICKSTEP_MAX_SDK", quickstepMaxSdk
     }
+    androidComponents {
+        onVariants(selector().all()) { variant ->
+            def capName = variant.name.capitalize()
+            def licenseeTask = tasks.named("licenseeAndroid$capName", LicenseeTask)
+            def copyArtifactsTask = tasks.register("copy${capName}Artifacts", Copy) {
+                dependsOn(licenseeTask)
+                from(licenseeTask.map { it.outputDir.file("artifacts.json") })
+                into(layout.buildDirectory.dir("generated/dependencyAssets"))
+            }
+            variant.sources.assets?.addGeneratedSourceDirectory(licenseeTask) {
+                objects.directoryProperty().fileProvider(copyArtifactsTask.map { it.destinationDir })
+            }
+        }
+    }
 
     applicationVariants.configureEach { variant ->
         variant.outputs.configureEach {
-            def channel = variant.productFlavors.last().name
-            outputFileName = "Lawnchair.${variant.versionName}.$channel.${variant.buildType.name}.apk"
+            outputFileName = "Lawnchair ${variant.versionName}.apk"
         }
     }
 
-    androidResources {
-        generateLocaleConfig true
-    }
-
     buildFeatures {
         aidl true
         buildConfig true
@@ -206,18 +214,15 @@ android {
         .toArray()
 
     buildTypes {
-        all {
-            signingConfig releaseSigning
-            pseudoLocalesEnabled true
-        }
-
         debug {
             applicationIdSuffix ".debug"
             resValue("string", "derived_app_name", "Lawnchair (Debug)")
+            signingConfig releaseSigning
         }
 
         release {
             resValue("string", "derived_app_name", "Lawnchair")
+            signingConfig releaseSigning
             minifyEnabled true
             shrinkResources true
             proguardFiles proguardFilesFromAosp + "proguard.pro"
@@ -233,30 +238,40 @@ android {
         includeInBundle = false
     }
 
+    // The flavor dimensions for build variants (e.g. aospWithQuickstep, aospWithoutQuickstep)
     // See: https://developer.android.com/studio/build/build-variants#flavor-dimensions
-    flavorDimensions += ["app", "recents", "channel"]
+    flavorDimensions += ["app", "recents"]
 
     productFlavors {
-        lawn {
+        aosp {
             dimension "app"
+            applicationId 'com.android.launcher3'
+            testApplicationId 'com.android.launcher3.tests'
         }
 
-        withQuickstep {
-            dimension "recents"
-            minSdk 26
+        l3go {
+            dimension "app"
+            applicationId 'com.android.launcher3'
+            testApplicationId 'com.android.launcher3.tests'
         }
 
-        github {
+        lawn {
+            dimension "app"
             applicationId 'app.lawnchair'
-            dimension "channel"
+            testApplicationId 'com.android.launcher3.tests'
+            isDefault true
         }
 
-        market {
-            applicationId "ch.deletescape.lawnchair.plah"
-            dimension "channel"
+        withQuickstep {
+            dimension "recents"
+            minSdk 26
             isDefault true
         }
 
+        withoutQuickstep {
+            dimension "recents"
+        }
+
         configureEach {
             resValue("string", "launcher_component", "${applicationId}/app.lawnchair.LawnchairLauncher")
         }
@@ -272,6 +287,42 @@ android {
             }
         }
 
+        androidTest {
+            res.srcDirs = ['tests/res']
+            java.srcDirs = ['tests/src', 'tests/tapl']
+            manifest.srcFile "tests/AndroidManifest-common.xml"
+        }
+
+        androidTestDebug {
+            manifest.srcFile "tests/AndroidManifest.xml"
+        }
+
+        aosp {
+            java.srcDirs = ['src_flags', 'src_shortcuts_overrides']
+        }
+
+        aospWithoutQuickstep {
+            manifest.srcFile "AndroidManifest.xml"
+        }
+
+        aospWithQuickstep {
+            manifest.srcFile "quickstep/AndroidManifest-launcher.xml"
+        }
+
+        l3go {
+            res.srcDirs = ['go/res']
+            java.srcDirs = ['go/src']
+            manifest.srcFile "go/AndroidManifest.xml"
+        }
+
+        l3goWithoutQuickstepDebug {
+            manifest.srcFile "AndroidManifest.xml"
+        }
+
+        l3goWithQuickstepDebug {
+            manifest.srcFile "quickstep/AndroidManifest-launcher.xml"
+        }
+
         lawn {
             java.srcDirs = ['src_flags', 'src_shortcuts_overrides', 'lawnchair/src', 'tests/shared']
             aidl.srcDirs = ['lawnchair/aidl']
@@ -285,12 +336,17 @@ android {
             }
         }
 
-        lawnWithQuickstepGithub {
-            manifest.srcFile "quickstep/AndroidManifest-launcher.xml"
+        lawnWithoutQuickstep {
+            manifest.srcFile "AndroidManifest.xml"
         }
 
-        lawnWithQuickstepMarket {
+        lawnWithQuickstep {
             manifest.srcFile "quickstep/AndroidManifest-launcher.xml"
+            assets.srcDir layout.buildDirectory.dir("generated/dependencyAssets/")
+        }
+
+        withoutQuickstep {
+            java.srcDirs = ['src_ui_overrides']
         }
 
         withQuickstep {
@@ -301,23 +357,6 @@ android {
     }
 }
 
-androidComponents {
-    onVariants(selector().all()) { variant ->
-        def capName = variant.name.capitalize()
-        def licenseeTask = tasks.named("licenseeAndroid$capName", LicenseeTask)
-        def copyArtifactsTask = tasks.register("copy${capName}Artifacts", Copy) {
-            dependsOn(licenseeTask)
-            from(licenseeTask.map { it.jsonOutput })
-            // Copy artifacts.json to a new directory.
-            into(layout.buildDirectory.dir("generated/dependencyAssets/${variant.name}"))
-        }
-        variant.sources.assets?.addGeneratedSourceDirectory(licenseeTask) {
-            // Avoid using LicenseeTask::outputDir as it contains extra files that we don't need.
-            objects.directoryProperty().fileProvider(copyArtifactsTask.map { it.destinationDir })
-        }
-    }
-}
-
 addFrameworkJar('framework-14.jar')
 
 dependencies {
@@ -349,6 +388,9 @@ dependencies {
     implementation fileTree(dir: FRAMEWORK_PREBUILTS_DIR, include: 'WindowManager-Shell-14.jar')
     withQuickstepCompileOnly fileTree(dir: FRAMEWORK_PREBUILTS_DIR, include: 'framework-14.jar')
 
+    // Required for AOSP to compile. This is already included in the sysui_shared.jar
+    withoutQuickstepImplementation fileTree(dir: FRAMEWORK_PREBUILTS_DIR, include: 'plugin_core.jar')
+
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4'
 
     implementation 'androidx.profileinstaller:profileinstaller:1.3.1'