Refactor SystemUI optimized defaults

Use a java_defaults configuration for all SystemUI derivatives.

Bug: 215530220
Test: m
Change-Id: I56ab90e143608333a7ab92be30f270379312658e
This commit is contained in:
Jared Duke
2023-02-23 14:27:47 -08:00
parent ec71863dd2
commit 5bf6fb367a

View File

@@ -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",