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

Commit b3241751 authored by Martin Stjernholm's avatar Martin Stjernholm
Browse files

Update dexpreopt for the ART APEX name change. 

Test: Build & boot
Bug: 135753770
Exempt-From-Owner-Approval: Approved internally
Change-Id: I130eaa6126d347bd1010c02b4f353b9e9b15ef84
Merged-In: I130eaa6126d347bd1010c02b4f353b9e9b15ef84
parent 1ebd5688

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