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

Merge changes from topic "art-without-bionic"

Browse Source 
* changes:
  Update dexpreopt for the ART APEX name change.
  Add new ART APEX.
This commit is contained in:
Martin Stjernholm
2019-09-02 10:28:30 +00:00
committed by Gerrit Code Review
parent 66d73717b5 b324175118
commit 1260ce2fb5
3 changed files with 10 additions and 7 deletions
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

7
target/product/runtime_libart.mk
View File

@@ -33,9 +33,12 @@ PRODUCT_PACKAGES += \
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
ext \ ext \
# Android Runtime APEX module. # Runtime (Bionic) APEX module.
PRODUCT_PACKAGES += com.android.runtime 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. # Certificates.
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \