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

Merge "Set a dedicated variable for the runtime apex libs."

Browse Source 
am: 5fa7e2fa2c

Change-Id: I559f6e96f4d97bf29aa726bde7dc17bea9984c08
This commit is contained in:
Nicolas Geoffray
2019-02-20 12:46:11 -08:00
committed by android-build-merger
parent d28c2b16ca 5fa7e2fa2c
commit acd4006aec
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/dex_preopt_config.mk
View File

@@ -115,7 +115,7 @@ ifeq ($(WRITE_SOONG_VARIABLES),true)
$(call add_json_list, PatternsOnSystemOther, $(SYSTEM_OTHER_ODEX_FILTER))
$(call add_json_bool, DisableGenerateProfile, $(filter false,$(WITH_DEX_PREOPT_GENERATE_PROFILE)))
$(call add_json_list, BootJars, $(PRODUCT_BOOT_JARS))
$(call add_json_list, TargetCoreJars, $(TARGET_CORE_JARS))
$(call add_json_list, RuntimeApexJars, $(RUNTIME_APEX_JARS))
$(call add_json_list, ProductUpdatableBootModules, $(PRODUCT_UPDATABLE_BOOT_MODULES))
$(call add_json_list, ProductUpdatableBootLocations, $(PRODUCT_UPDATABLE_BOOT_LOCATIONS))
$(call add_json_list, SystemServerJars, $(PRODUCT_SYSTEM_SERVER_JARS))

5
core/envsetup.mk
View File

@@ -206,7 +206,10 @@ endef
#################################################################
# Set up minimal BOOTCLASSPATH list of jars to build/execute
# java code with dalvikvm/art.
TARGET_CORE_JARS := core-oj core-libart conscrypt okhttp bouncycastle apache-xml
# Jars present in the runtime apex. These should match exactly the list of
# Java libraries in the runtime apex build rule.
RUNTIME_APEX_JARS := core-oj core-libart okhttp bouncycastle apache-xml
TARGET_CORE_JARS := $(RUNTIME_APEX_JARS) conscrypt
ifeq ($(EMMA_INSTRUMENT),true)
ifneq ($(EMMA_INSTRUMENT_STATIC),true)
# For instrumented build, if Jacoco is not being included statically