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

Commit 5fa7e2fa authored by Nicolas Geoffray's avatar Nicolas Geoffray Committed by Gerrit Code Review
Browse files

Merge "Set a dedicated variable for the runtime apex libs."

parents cffe5bb1 f026d899

core/dex_preopt_config.mk

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ ifeq ($(WRITE_SOONG_VARIABLES),true) 
  $(call add_json_list, PatternsOnSystemOther,              $(SYSTEM_OTHER_ODEX_FILTER))

  $(call add_json_bool, DisableGenerateProfile,             $(filter false,$(WITH_DEX_PREOPT_GENERATE_PROFILE)))

  $(call add_json_list, BootJars,                           $(PRODUCT_BOOT_JARS))

  $(call add_json_list, TargetCoreJars,                     $(TARGET_CORE_JARS))

  $(call add_json_list, RuntimeApexJars,                    $(RUNTIME_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 −1
Original line number Diff line number Diff line
@@ -206,7 +206,10 @@ endef 
#################################################################

# Set up minimal BOOTCLASSPATH list of jars to build/execute

# java code with dalvikvm/art.

TARGET_CORE_JARS := core-oj core-libart conscrypt okhttp bouncycastle apache-xml

# 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 okhttp bouncycastle apache-xml

TARGET_CORE_JARS := $(RUNTIME_APEX_JARS) conscrypt

ifeq ($(EMMA_INSTRUMENT),true)

  ifneq ($(EMMA_INSTRUMENT_STATIC),true)

    # For instrumented build, if Jacoco is not being included statically