Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 970bf093 authored by Timothy Yiu's avatar Timothy Yiu Committed by Gerrit Code Review
Browse files

Merge "Add config for FULL_SYSTEM_OPTIMIZE_JAVA" into main

parents 5366754f bbaa5efb

core/android_soong_config_vars.mk

+6 −0
Original line number Diff line number Diff line
@@ -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),)

core/config.mk

+6 −0
Original line number Diff line number Diff line
@@ -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