diff options
| author | Martin Stjernholm <mast@google.com> | 2019-09-02 10:28:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-09-02 10:28:30 +0000 |
| commit | 1260ce2fb57f97224bea09d3fd31d3a85d6ff9a1 (patch) | |
| tree | 05416f883c600171bf470c7cdfcbf0dbc809bc4e | |
| parent | 66d73717b5c0249aa51bffd06cb4ecda7fff19c0 (diff) | |
| parent | b324175118f50a1acfb40916215ad5f444338265 (diff) | |
| download | build-1260ce2fb57f97224bea09d3fd31d3a85d6ff9a1.tar.gz | |
Merge changes from topic "art-without-bionic"
* changes:
Update dexpreopt for the ART APEX name change.
Add new ART APEX.
| -rw-r--r-- | core/dex_preopt_config.mk | 2 | ||||
| -rw-r--r-- | core/envsetup.mk | 8 | ||||
| -rw-r--r-- | target/product/runtime_libart.mk | 7 |
3 files changed, 10 insertions, 7 deletions
diff --git a/core/dex_preopt_config.mk b/core/dex_preopt_config.mk index b856bf436d..69eaea1d73 100644 --- a/core/dex_preopt_config.mk +++ b/core/dex_preopt_config.mk @@ -99,7 +99,7 @@ ifeq ($(WRITE_SOONG_VARIABLES),true) $(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_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, ProductUpdatableBootLocations, $(PRODUCT_UPDATABLE_BOOT_LOCATIONS)) $(call add_json_list, SystemServerJars, $(PRODUCT_SYSTEM_SERVER_JARS)) diff --git a/core/envsetup.mk b/core/envsetup.mk index c61760b59d..88bf352c76 100644 --- a/core/envsetup.mk +++ b/core/envsetup.mk @@ -253,10 +253,10 @@ endef ################################################################# # Set up minimal BOOTCLASSPATH list of jars to build/execute # java code with dalvikvm/art. -# 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 core-icu4j okhttp bouncycastle apache-xml -TARGET_CORE_JARS := $(RUNTIME_APEX_JARS) conscrypt +# Jars present in the ART apex. These should match exactly the list of +# Java libraries in the ART apex build rule. +ART_APEX_JARS := core-oj core-libart core-icu4j okhttp bouncycastle apache-xml +TARGET_CORE_JARS := $(ART_APEX_JARS) conscrypt ifeq ($(EMMA_INSTRUMENT),true) ifneq ($(EMMA_INSTRUMENT_STATIC),true) # For instrumented build, if Jacoco is not being included statically diff --git a/target/product/runtime_libart.mk b/target/product/runtime_libart.mk index 5db32f257c..581a72be52 100644 --- a/target/product/runtime_libart.mk +++ b/target/product/runtime_libart.mk @@ -33,9 +33,12 @@ PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \ ext \ -# Android Runtime APEX module. +# Runtime (Bionic) APEX module. PRODUCT_PACKAGES += com.android.runtime -PRODUCT_HOST_PACKAGES += com.android.runtime + +# ART APEX module. +PRODUCT_PACKAGES += com.android.art +PRODUCT_HOST_PACKAGES += com.android.art # Certificates. PRODUCT_PACKAGES += \ |