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

Commit 77954bae authored by Sunny Goyal's avatar Sunny Goyal
Browse files

Cleaning up some build configurations 

> Removing Launcher3Go-without-quickstep
> Removing src_ui_overrides to src_no_quickstep
> Removing unnecessary code swpa for GO builds

Bug: 330920490
Flag: None
Test: Presubmit, everything builds
Change-Id: I5746dbc7c5a37c1d99d78b55bf2a6adce1a711c9
parent 4fd3e878

Android.bp

+45 −102
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ min_launcher3_sdk_version = "30" 


// Common source files used to build launcher (java and kotlin)

// All sources are split so they can be reused in many other libraries/apps in other folders



// Main Launcher source, excluding the build config

filegroup {

    name: "launcher-src",

    srcs: [
@@ -29,6 +31,7 @@ filegroup { 
    ],

}



// Source code for quickstep build, on top of launcher-src

filegroup {

    name: "launcher-quickstep-src",

    srcs: [
@@ -37,35 +40,20 @@ filegroup { 
    ],

}



// Alternate source when quickstep is not included

filegroup {

    name: "launcher-go-src",

    srcs: [

        "go/src/**/*.java",

        "go/src/**/*.kt",

    ],

}



filegroup {

    name: "launcher-go-quickstep-src",

    name: "launcher-src_no_quickstep",

    srcs: [

        "go/quickstep/src/**/*.java",

        "go/quickstep/src/**/*.kt",

        "src_no_quickstep/**/*.java",

        "src_no_quickstep/**/*.kt",

    ],

}



// Default build config for Launcher3

filegroup {

    name: "launcher-src_shortcuts_overrides",

    name: "launcher-build-config",

    srcs: [

        "src_shortcuts_overrides/**/*.java",

        "src_shortcuts_overrides/**/*.kt",

    ],

}



filegroup {

    name: "launcher-src_ui_overrides",

    srcs: [

        "src_ui_overrides/**/*.java",

        "src_ui_overrides/**/*.kt",

        "src_build_config/**/*.java",

    ],

}
@@ -165,36 +153,16 @@ android_library { 
        "iconloader_base",

        "view_capture",

        "animationlib",

    ],

    manifest: "AndroidManifest-common.xml",

    sdk_version: "current",

    min_sdk_version: min_launcher3_sdk_version,

    lint: {

        baseline_filename: "lint-baseline.xml",

    },

}



//

// Build rule for Launcher3 dependencies lib.

//

android_library {

    name: "Launcher3CommonDepsLib",

    srcs: ["src_build_config/**/*.java"],

    static_libs: [

        "SystemUI-statsd",

        "Launcher3ResLib",

        "launcher-testing-shared",

        "animationlib",

        "kotlinx_coroutines_android",

        "kotlinx_coroutines",

        "com_android_launcher3_flags_lib",

        "com_android_wm_shell_flags_lib",

        "android.appwidget.flags-aconfig-java",

        "com.android.window.flags.window-aconfig-java",

    ],

    manifest: "AndroidManifest-common.xml",

    sdk_version: "current",

    min_sdk_version: min_launcher3_sdk_version,

    manifest: "AndroidManifest-common.xml",

    lint: {

        baseline_filename: "lint-baseline.xml",

    },
@@ -207,12 +175,12 @@ android_app { 
    name: "Launcher3",



    static_libs: [

        "Launcher3CommonDepsLib",

        "Launcher3ResLib",

    ],

    srcs: [

        ":launcher-src",

        ":launcher-src_shortcuts_overrides",

        ":launcher-src_ui_overrides",

        ":launcher-src_no_quickstep",

        ":launcher-build-config",

    ],



    optimize: {
@@ -259,24 +227,21 @@ android_library { 
        "lottie",

        "SystemUISharedLib",

        "SettingsLibSettingsTheme",

        "SystemUI-statsd",

        "animationlib",

    ],

    manifest: "quickstep/AndroidManifest.xml",

    min_sdk_version: "current",

}



// Library with all the dependencies for building Launcher Go

// Library with all the source code and dependencies for building Launcher Go

android_library {

    name: "LauncherGoResLib",

    name: "Launcher3GoLib",

    srcs: [

        ":launcher-src",

        ":launcher-quickstep-src",

        ":launcher-go-src",

        ":launcher-go-quickstep-src",

        "go/quickstep/src/**/*.java",

        "go/quickstep/src/**/*.kt",

    ],

    resource_dirs: [

        "go/res",

        "go/quickstep/res",

    ],

    // Note the ordering here is important when it comes to resource
@@ -284,7 +249,6 @@ android_library { 
    // in QuickstepResLib to take precendece, so it should be the final

    // dependency. See b/205278434 for how this can go wrong.

    static_libs: [

        "Launcher3CommonDepsLib",

        "QuickstepResLib",

        "androidx.room_room-runtime",

    ],
@@ -299,13 +263,13 @@ android_library { 
    use_resource_processor: false,

}



// Build rule for Quickstep library

// Library with all the source code and dependencies for building Quickstep

android_library {

    name: "Launcher3QuickStepLib",

    srcs: [

        ":launcher-src",

        ":launcher-quickstep-src",

        ":launcher-src_shortcuts_overrides",

        ":launcher-build-config",

    ],

    resource_dirs: [],

    libs: [
@@ -317,10 +281,7 @@ android_library { 
    // dependency. See b/208647810 for how this can go wrong.

    static_libs: [

        "SystemUI-statsd",

        "SystemUISharedLib",

        "Launcher3CommonDepsLib",

        "QuickstepResLib",

        "animationlib",

    ],

    manifest: "quickstep/AndroidManifest.xml",

    platform_apis: true,
@@ -329,75 +290,73 @@ android_library { 
    use_resource_processor: false,

}



// Build rule for Launcher3 Go app for Android Go devices.

// Build rule for Quickstep app.

android_app {

    name: "Launcher3Go",



    static_libs: ["Launcher3CommonDepsLib"],



    srcs: [

        ":launcher-src",

        ":launcher-go-src",

        ":launcher-src_ui_overrides",

    ],



    resource_dirs: ["go/res"],

    name: "Launcher3QuickStep",



    static_libs: ["Launcher3QuickStepLib"],

    optimize: {

        proguard_flags_files: ["proguard.flags"],

        enabled: false,

    },



    sdk_version: "current",

    platform_apis: true,

    min_sdk_version: "current",

    target_sdk_version: "current",



    privileged: true,

    system_ext_specific: true,

    overrides: [

        "Home",

        "Launcher2",

        "Launcher3",

        "Launcher3QuickStep",

    ],

    required: ["privapp_whitelist_com.android.launcher3"],



    resource_dirs: ["quickstep/res"],



    additional_manifests: [

        "AndroidManifest.xml",

        "quickstep/AndroidManifest-launcher.xml",

        "AndroidManifest-common.xml",

    ],



    manifest: "go/AndroidManifest.xml",

    manifest: "quickstep/AndroidManifest.xml",

    jacoco: {

        include_filter: ["com.android.launcher3.*"],

    },



}



// Build rule for Quickstep app.



// Build rule for Launcher3 Go app with quickstep for Android Go devices.

// Note that the following two rules are exactly same, and should

// eventually be merged into a single target

android_app {

    name: "Launcher3QuickStep",

    name: "Launcher3Go",



    static_libs: ["Launcher3QuickStepLib"],

    optimize: {

        enabled: false,

    },

    static_libs: ["Launcher3GoLib"],



    platform_apis: true,

    min_sdk_version: "current",

    target_sdk_version: "current",



    optimize: {

        proguard_flags_files: ["proguard.flags"],

        enabled: true,

    },



    privileged: true,

    system_ext_specific: true,

    overrides: [

        "Home",

        "Launcher2",

        "Launcher3",

        "Launcher3QuickStep",

    ],

    required: ["privapp_whitelist_com.android.launcher3"],



    resource_dirs: ["quickstep/res"],



    additional_manifests: [

        "quickstep/AndroidManifest-launcher.xml",

        "go/AndroidManifest.xml",

        "go/AndroidManifest-launcher.xml",

        "AndroidManifest-common.xml",

    ],
@@ -405,31 +364,16 @@ android_app { 
    jacoco: {

        include_filter: ["com.android.launcher3.*"],

    },



}



// Build rule for Launcher3 Go app with quickstep for Android Go devices.

android_app {

    name: "Launcher3QuickStepGo",



    static_libs: [

        "SystemUI-statsd",

        "SystemUISharedLib",

        "LauncherGoResLib",

    ],

    static_libs: ["Launcher3GoLib"],



    platform_apis: true,

    min_sdk_version: "current",

    target_sdk_version: "current",



    srcs: [],



    resource_dirs: [

        "go/quickstep/res",

        "go/res",

        "quickstep/res",

    ],



    optimize: {

        proguard_flags_files: ["proguard.flags"],

        enabled: true,
@@ -455,5 +399,4 @@ android_app { 
    jacoco: {

        include_filter: ["com.android.launcher3.*"],

    },



}

go/quickstep/res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -21,4 +21,7 @@ 
    <bool name="enable_niu_actions">true</bool>



    <string name="task_overlay_factory_class" translatable="false">com.android.quickstep.TaskOverlayFactoryGo</string>



    <!-- String representing the intent to delete a package. -->

    <string name="delete_package_intent" translatable="false">#Intent;action=android.intent.action.DELETE;launchFlags=0x10800000;B.android.intent.extra.RETURN_RESULT=true;end</string>

</resources>
 
 No newline at end of file

go/quickstep/src/com/android/launcher3/BuildConfig.java

0 → 100644
+43 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2018 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.launcher3;



public final class BuildConfig {

    public static final String APPLICATION_ID = "com.android.launcher3";



    public static final boolean IS_STUDIO_BUILD = false;

    /**

     * Flag to state if the QSB is on the first screen and placed on the top,

     * this can be overwritten in other launchers with a different value, if needed.

     */

    public static final boolean QSB_ON_FIRST_SCREEN = true;



    /**

     * Flag to state if the widget on the top of the first screen should be shown.

     */

    public static final boolean WIDGET_ON_FIRST_SCREEN = false;



    /**

     * Flag to control various developer centric features

     */

    public static final boolean IS_DEBUG_DEVICE = false;



    // Flag to control widgets support in Launcher

    public static final boolean WIDGETS_ENABLED = false;

    // Flag to control notification dots support in Launcher

    public static final boolean NOTIFICATION_DOTS_ENABLED = false;

}

go/res/values-v26/bools.xml

deleted100644 → 0
+0 −22
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/* Copyright 2017, The Android Open Source Project

**

** Licensed under the Apache License, Version 2.0 (the "License");

** you may not use this file except in compliance with the License.

** You may obtain a copy of the License at

**

**     http://www.apache.org/licenses/LICENSE-2.0

**

** Unless required by applicable law or agreed to in writing, software

** distributed under the License is distributed on an "AS IS" BASIS,

** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

** See the License for the specific language governing permissions and

** limitations under the License.

*/

-->



<resources>

    <bool name="notification_dots_enabled">false</bool>

</resources>