commit 970bf093cd33e9c84683596e8e4b93e3a1e80a6e
author Timothy Yiu <tyiu@google.com> Tue Nov 28 05:41:32 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Nov 28 05:41:32 2023 +0000
tree 86b5f32ee72012ae785b83f8ff8e56e769ae7dfc
parent 5366754f622806196741e0a184253eef73aeca49
parent bbaa5efbbc08202172806b7e89525635358f836b

Merge "Add config for FULL_SYSTEM_OPTIMIZE_JAVA" into main

core/android_soong_config_vars.mk

diff --git a/core/android_soong_config_vars.mk b/core/android_soong_config_vars.mk
index e731fa3..c74aa49 100644
--- a/core/android_soong_config_vars.mk
+++ b/core/android_soong_config_vars.mk
@@ -181,7 +181,13 @@
 else
   SYSTEM_OPTIMIZE_JAVA ?= true
 endif
+
+ifeq (true,$(FULL_SYSTEM_OPTIMIZE_JAVA))
+  SYSTEM_OPTIMIZE_JAVA := true
+endif
+
 $(call add_soong_config_var,ANDROID,SYSTEM_OPTIMIZE_JAVA)
+$(call add_soong_config_var,ANDROID,FULL_SYSTEM_OPTIMIZE_JAVA)
 
 # Check for SupplementalApi module.
 ifeq ($(wildcard packages/modules/SupplementalApi),)

core/config.mk

diff --git a/core/config.mk b/core/config.mk
index 90cc33c..eefd268 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -1313,3 +1313,9 @@
 .KATI_READONLY := DEFAULT_DATA_OUT_MODULES
 
 include $(BUILD_SYSTEM)/dumpvar.mk
+
+ifeq (true,$(FULL_SYSTEM_OPTIMIZE_JAVA))
+ifeq (,$(SYSTEM_OPTIMIZE_JAVA))
+$(error SYSTEM_OPTIMIZE_JAVA must be enabled when FULL_SYSTEM_OPTIMIZE_JAVA is enabled)
+endif
+endif