commit 88aaae35472dcf27479b72af188caed33cbd364a
author Jared Duke <jdduke@google.com> Wed Jun 22 20:55:58 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jun 22 20:55:58 2022 +0000
tree 75978e6bac6b5bb192cc05e5b6d42916af5bcfcc
parent 48764809923a699aaea23eaf530343bc24f108c7
parent b11b1d243769436450a5c72c55e843083e84e206

Merge "Enable R8 code shrinking for system_server by default"

core/android_soong_config_vars.mk

diff --git a/core/android_soong_config_vars.mk b/core/android_soong_config_vars.mk
index 6dfb61e..6e52195 100644
--- a/core/android_soong_config_vars.mk
+++ b/core/android_soong_config_vars.mk
@@ -97,6 +97,7 @@
 # TODO(b/203088572): Remove when Java optimizations enabled by default for
 # SystemUI.
 $(call add_soong_config_var,ANDROID,SYSTEMUI_OPTIMIZE_JAVA)
-# TODO(b/196084106): Remove when Java optimizations enabled by default for
-# system packages.
+# Enable by default unless explicitly set or overridden.
+# See frameworks/base/services/Android.bp for additional notes on side effects.
+SYSTEM_OPTIMIZE_JAVA ?= true
 $(call add_soong_config_var,ANDROID,SYSTEM_OPTIMIZE_JAVA)