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

Commit 5bf6fb36 authored by Jared Duke's avatar Jared Duke
Browse files

Refactor SystemUI optimized defaults 

Use a java_defaults configuration for all SystemUI derivatives.

Bug: 215530220
Test: m
Change-Id: I56ab90e143608333a7ab92be30f270379312658e
parent ec71863d

packages/SystemUI/Android.bp

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

    defaults: [

        "platform_app_defaults",

        "SystemUI_app_defaults",

        "SystemUI_optimized_defaults",

        "SystemUI_compose_defaults",

    ],

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



systemui_optimized_java_defaults {

    name: "SystemUI_app_defaults",

    name: "SystemUI_optimized_defaults",

    soong_config_variables: {

        SYSTEMUI_OPTIMIZE_JAVA: {

            optimize: {
@@ -451,12 +451,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"],

                },

            },

        },
@@ -467,7 +465,7 @@ android_app { 
    name: "SystemUI",

    defaults: [

        "platform_app_defaults",

        "SystemUI_app_defaults",

        "SystemUI_optimized_defaults",

    ],

    static_libs: [

        "SystemUI-core",
@@ -482,6 +480,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",