From 9dfa77bfeba3fd227d08470da990da47c0e47f8a Mon Sep 17 00:00:00 2001 From: Jared Duke Date: Wed, 22 Dec 2021 13:31:06 -0800 Subject: [PATCH] Update SystemUI build flag for optimization Use the new `SYSTEMUI_OPTIMIZE_JAVA` build flag instead, decoupling optimization opt-in from system_server. Note that this remains opt-in and disabled by default. Bug: 203472868 Test: SYSTEMUI_OPTIMIZE_JAVA=true m SystemUI (validate SystemUI.apk) Change-Id: Ib0482324561939da806707aea860d040e9aa81ef --- packages/SystemUI/Android.bp | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/packages/SystemUI/Android.bp b/packages/SystemUI/Android.bp index 559c31a92004b..b19ef3a243aa8 100644 --- a/packages/SystemUI/Android.bp +++ b/packages/SystemUI/Android.bp @@ -234,15 +234,23 @@ android_library { plugins: ["dagger2-compiler"], } -soong_config_module_type_import { - from: "frameworks/base/services/Android.bp", - module_types: ["system_optimized_java_defaults"], +// Opt-in config for optimizing the SystemUI target using R8. +// Enabled via `export SYSTEMUI_OPTIMIZE_JAVA=true`, or explicitly in Make via +// the `SOONG_CONFIG_ANDROID_SYSTEMUI_OPTIMIZE_JAVA` variable. +// TODO(b/203472868): Enable optimizations by default after stabilizing and +// building out retrace infrastructure. +soong_config_module_type { + name: "systemui_optimized_java_defaults", + module_type: "java_defaults", + config_namespace: "ANDROID", + bool_variables: ["SYSTEMUI_OPTIMIZE_JAVA"], + properties: ["optimize"], } -system_optimized_java_defaults { +systemui_optimized_java_defaults { name: "SystemUI_app_defaults", soong_config_variables: { - SYSTEM_OPTIMIZE_JAVA: { + SYSTEMUI_OPTIMIZE_JAVA: { optimize: { enabled: true, optimize: true,