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

Commit 1260ce2f authored by Martin Stjernholm's avatar Martin Stjernholm Committed by Gerrit Code Review
Browse files

Merge changes from topic "art-without-bionic" 

* changes:
  Update dexpreopt for the ART APEX name change.
  Add new ART APEX.
parents 66d73717 b3241751

core/dex_preopt_config.mk

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

core/envsetup.mk

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

target/product/runtime_libart.mk

+5 −2
Original line number Diff line number Diff line
@@ -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 += \