tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge changes from topic "art-without-bionic" am: 1260ce2fb5 am: 2722c66be7

Browse source 
am: 948c5d4d63

Change-Id: I2ba7d96673ccc7aec3c0dfa2dc6f17886c7b8184
This commit is contained in:
Martin Stjernholm 2019-09-02 04:21:26 -07:00 committed by android-build-merger
commit 770fe6af41
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/dex_preopt_config.mk
View file

@ -99,7 +99,7 @@ ifeq ($(WRITE_SOONG_VARIABLES),true)
$(call add_json_bool, DisableGenerateProfile, $(filter false,$(WITH_DEX_PREOPT_GENERATE_PROFILE))) $(call add_json_bool, DisableGenerateProfile, $(filter false,$(WITH_DEX_PREOPT_GENERATE_PROFILE)))
$(call add_json_str, ProfileDir, $(PRODUCT_DEX_PREOPT_PROFILE_DIR)) $(call add_json_str, ProfileDir, $(PRODUCT_DEX_PREOPT_PROFILE_DIR))
$(call add_json_list, BootJars, $(PRODUCT_BOOT_JARS)) $(call add_json_list, BootJars, $(PRODUCT_BOOT_JARS))
$(call add_json_list, RuntimeApexJars, $(RUNTIME_APEX_JARS)) $(call add_json_list, ArtApexJars, $(ART_APEX_JARS))
$(call add_json_list, ProductUpdatableBootModules, $(PRODUCT_UPDATABLE_BOOT_MODULES)) $(call add_json_list, ProductUpdatableBootModules, $(PRODUCT_UPDATABLE_BOOT_MODULES))
$(call add_json_list, ProductUpdatableBootLocations, $(PRODUCT_UPDATABLE_BOOT_LOCATIONS)) $(call add_json_list, ProductUpdatableBootLocations, $(PRODUCT_UPDATABLE_BOOT_LOCATIONS))
$(call add_json_list, SystemServerJars, $(PRODUCT_SYSTEM_SERVER_JARS)) $(call add_json_list, SystemServerJars, $(PRODUCT_SYSTEM_SERVER_JARS))

8
core/envsetup.mk
View file

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