StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add config for FULL_SYSTEM_OPTIMIZE_JAVA" into main am: 970bf093cd

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/2806341

Change-Id: I4d65df474d4d3b567e2d30e0acb50ab91941c9e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Timothy Yiu
2023-11-28 06:21:04 +00:00
committed by Automerger Merge Worker
parent 0687b5d4ef 970bf093cd
commit 01d0904f8d
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/android_soong_config_vars.mk
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),)

6
core/config.mk
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