Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 61ad3016 authored by Kevin's avatar Kevin
Browse files

Add flavor dimension for quickstep on Launcher3.

This adds a dimension for having quickstep/not having quickstep and
consequently adds l3gowithQuickstep as a build variant on the Launcher3
gradle file.

Test: Built all apks
Change-Id: I634e7e458847ca10e5ad165ea47b968ba38a5029
parent 5eae549e
Loading
Loading
Loading
Loading
+24 −15
Original line number Diff line number Diff line
@@ -36,28 +36,32 @@ android {
        targetCompatibility JavaVersion.VERSION_1_8
    }

    flavorDimensions "default"
    // The flavor dimensions for build variants (e.g. aospWithQuickstep, aospWithoutQuickstep)
    // See: https://developer.android.com/studio/build/build-variants#flavor-dimensions
    flavorDimensions "app", "recents"

    productFlavors {
        aosp {
            dimension "default"
            dimension "app"
            applicationId 'com.android.launcher3'
            testApplicationId 'com.android.launcher3.tests'
        }

        l3go {
            dimension "default"
            dimension "app"
            applicationId 'com.android.launcher3'
            testApplicationId 'com.android.launcher3.tests'
        }

        quickstep {
            dimension "default"
            applicationId 'com.android.launcher3'
            testApplicationId 'com.android.launcher3.tests'
        withQuickstep {
            dimension "recents"

            minSdkVersion 28
        }

        withoutQuickstep {
            dimension "recents"
        }
    }

    // Disable release builds for now
@@ -93,18 +97,23 @@ android {
        }

        aosp {
            java.srcDirs = ['src_flags', "src_ui_overrides", 'src_shortcuts_overrides']
            java.srcDirs = ['src_flags', 'src_shortcuts_overrides']
            manifest.srcFile "AndroidManifest.xml"
        }

        l3go {
            res.srcDirs = ['go/res']
            java.srcDirs = ['go/src', "src_ui_overrides"]
            java.srcDirs = ['go/src']
            manifest.srcFile "go/AndroidManifest.xml"
        }

        quickstep {
        withoutQuickstep {
            java.srcDirs = ['src_ui_overrides']
        }

        withQuickstep {
            res.srcDirs = ['quickstep/res']
            java.srcDirs = ['src_flags', 'quickstep/src', 'src_shortcuts_overrides']
            java.srcDirs = ['quickstep/src']
            manifest.srcFile "quickstep/AndroidManifest.xml"
        }
    }
@@ -124,11 +133,11 @@ dependencies {
    implementation project(':IconLoader')
    implementation fileTree(dir: "libs", include: 'launcher_protos.jar')

    // This is already included in sysui_shared
    aospImplementation fileTree(dir: "libs", include: 'plugin_core.jar')
    l3goImplementation fileTree(dir: "libs", include: 'plugin_core.jar')
    // Recents lib dependency
    withQuickstepImplementation fileTree(dir: "quickstep/libs", include: 'sysui_shared.jar')

    quickstepImplementation fileTree(dir: "quickstep/libs", include: 'sysui_shared.jar')
    // Required for AOSP to compile. This is already included in the sysui_shared.jar
    withoutQuickstepImplementation fileTree(dir: "libs", include: 'plugin_core.jar')

    testImplementation 'junit:junit:4.12'
    androidTestImplementation "org.mockito:mockito-core:1.9.5"