Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Refactor SystemUI optimized defaults" into udc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2023-03-21 16:23:21 +00:00
committed by Android (Google) Code Review
parent e8151bf27d 5bf6fb367a
commit bbdfd3cb17
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
packages/SystemUI/Android.bp
View File

@@ -376,7 +376,7 @@ android_app {
name: "SystemUIRobo-stub", name: "SystemUIRobo-stub",
defaults: [ defaults: [
"platform_app_defaults", "platform_app_defaults",
"SystemUI_app_defaults", "SystemUI_optimized_defaults",
"SystemUI_compose_defaults", "SystemUI_compose_defaults",
], ],
manifest: "tests/AndroidManifest-base.xml", manifest: "tests/AndroidManifest-base.xml",
@@ -443,7 +443,7 @@ soong_config_module_type {
} }
systemui_optimized_java_defaults { systemui_optimized_java_defaults {
name: "SystemUI_app_defaults", name: "SystemUI_optimized_defaults",
soong_config_variables: { soong_config_variables: {
SYSTEMUI_OPTIMIZE_JAVA: { SYSTEMUI_OPTIMIZE_JAVA: {
optimize: { optimize: {
@@ -452,12 +452,10 @@ systemui_optimized_java_defaults {
shrink: true, shrink: true,
shrink_resources: true, shrink_resources: true,
proguard_compatibility: false, proguard_compatibility: false,
proguard_flags_files: ["proguard.flags"],
}, },
conditions_default: { conditions_default: {
optimize: { optimize: {
proguard_compatibility: false, proguard_compatibility: false,
proguard_flags_files: ["proguard.flags"],
}, },
}, },
}, },
@@ -468,7 +466,7 @@ android_app {
name: "SystemUI", name: "SystemUI",
defaults: [ defaults: [
"platform_app_defaults", "platform_app_defaults",
"SystemUI_app_defaults", "SystemUI_optimized_defaults",
], ],
static_libs: [ static_libs: [
"SystemUI-core", "SystemUI-core",
@@ -483,6 +481,9 @@ android_app {
kotlincflags: ["-Xjvm-default=enable"], kotlincflags: ["-Xjvm-default=enable"],
dxflags: ["--multi-dex"], dxflags: ["--multi-dex"],
optimize: {
proguard_flags_files: ["proguard.flags"],
},
required: [ required: [
"privapp_whitelist_com.android.systemui", "privapp_whitelist_com.android.systemui",
"wmshell.protolog.json.gz", "wmshell.protolog.json.gz",