Merge "Add config for FULL_SYSTEM_OPTIMIZE_JAVA" into main

This commit is contained in:
Timothy Yiu 2023-11-28 05:41:32 +00:00 committed by Gerrit Code Review
commit 970bf093cd
2 changed files with 12 additions and 0 deletions

View file

@ -181,7 +181,13 @@ else ifneq (platform:services,$(lastword $(PRODUCT_SYSTEM_SERVER_JARS)))
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),)

View file

@ -1313,3 +1313,9 @@ DEFAULT_DATA_OUT_MODULES := ltp $(ltp_packages)
.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