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

Commit 5268bfa6 authored by Ulyana Trafimovich's avatar Ulyana Trafimovich Committed by Gerrit Code Review
Browse files

Merge "Respect JIT-zygote config when generating boot image location."

parents 3ac9a12f d1c9bfe8

core/dex_preopt_odex_install.mk

+4 −1
Original line number Diff line number Diff line
@@ -111,6 +111,7 @@ endif 
my_dexpreopt_archs :=

my_dexpreopt_images :=

my_dexpreopt_images_deps :=

my_dexpreopt_image_locations :=

my_dexpreopt_infix := boot

ifeq (true, $(DEXPREOPT_USE_APEX_IMAGE))

  my_dexpreopt_infix := apex
@@ -183,6 +184,8 @@ ifdef LOCAL_DEX_PREOPT 
    endif  # TARGET_2ND_ARCH

  endif  # LOCAL_MODULE_CLASS



  my_dexpreopt_image_locations += $(DEXPREOPT_IMAGE_LOCATIONS_$(my_dexpreopt_infix))



  my_filtered_optional_uses_libraries := $(filter-out $(INTERNAL_PLATFORM_MISSING_USES_LIBRARIES), \

    $(LOCAL_OPTIONAL_USES_LIBRARIES))
@@ -234,7 +237,7 @@ ifdef LOCAL_DEX_PREOPT 
  $(call end_json_map)

  $(call add_json_list, Archs,                          $(my_dexpreopt_archs))

  $(call add_json_list, DexPreoptImages,                $(my_dexpreopt_images))

  $(call add_json_list, DexPreoptImageLocations,        $(DEXPREOPT_IMAGE_LOCATIONS))

  $(call add_json_list, DexPreoptImageLocations,        $(my_dexpreopt_image_locations))

  $(call add_json_list, PreoptBootClassPathDexFiles,    $(DEXPREOPT_BOOTCLASSPATH_DEX_FILES))

  $(call add_json_list, PreoptBootClassPathDexLocations,$(DEXPREOPT_BOOTCLASSPATH_DEX_LOCATIONS))

  $(call add_json_bool, PreoptExtractedApk,             $(my_preopt_for_extracted_apk))