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

Commit 1212c08f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Refactor SystemUI optimized defaults" into udc-dev am: bbdfd3cb am: 93e25c18 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21941280



Change-Id: I59561ffface98ab4dec4af40b1be16278004cbfd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3e420227 93e25c18

packages/SystemUI/Android.bp

+6 −5
Original line number Diff line number Diff line
@@ -376,7 +376,7 @@ android_app { 
    name: "SystemUIRobo-stub",

    defaults: [

        "platform_app_defaults",

        "SystemUI_app_defaults",

        "SystemUI_optimized_defaults",

        "SystemUI_compose_defaults",

    ],

    manifest: "tests/AndroidManifest-base.xml",
@@ -443,7 +443,7 @@ soong_config_module_type { 
}



systemui_optimized_java_defaults {

    name: "SystemUI_app_defaults",

    name: "SystemUI_optimized_defaults",

    soong_config_variables: {

        SYSTEMUI_OPTIMIZE_JAVA: {

            optimize: {
@@ -452,12 +452,10 @@ systemui_optimized_java_defaults { 
                shrink: true,

                shrink_resources: true,

                proguard_compatibility: false,

                proguard_flags_files: ["proguard.flags"],

            },

            conditions_default: {

                optimize: {

                    proguard_compatibility: false,

                    proguard_flags_files: ["proguard.flags"],

                },

            },

        },
@@ -468,7 +466,7 @@ android_app { 
    name: "SystemUI",

    defaults: [

        "platform_app_defaults",

        "SystemUI_app_defaults",

        "SystemUI_optimized_defaults",

    ],

    static_libs: [

        "SystemUI-core",
@@ -483,6 +481,9 @@ android_app { 
    kotlincflags: ["-Xjvm-default=enable"],



    dxflags: ["--multi-dex"],

    optimize: {

        proguard_flags_files: ["proguard.flags"],

    },

    required: [

        "privapp_whitelist_com.android.systemui",

        "wmshell.protolog.json.gz",