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

Commit abeb9ec6 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Emit DexPreoptImageLocationsOnDevice as well" into sc-dev am: 1e6044e5 

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15088021

Change-Id: I4724183a24345603449a84d7d29797b3b71cd059
parents 6bcad4a5 1e6044e5

core/dex_preopt_odex_install.mk

+6 −3
Original line number Diff line number Diff line
@@ -275,7 +275,8 @@ endif 
my_dexpreopt_archs :=

my_dexpreopt_images :=

my_dexpreopt_images_deps :=

my_dexpreopt_image_locations :=

my_dexpreopt_image_locations_on_host :=

my_dexpreopt_image_locations_on_device :=

my_dexpreopt_infix := boot

ifeq (true, $(DEXPREOPT_USE_ART_IMAGE))

  my_dexpreopt_infix := art
@@ -348,7 +349,8 @@ ifdef LOCAL_DEX_PREOPT 
    endif  # TARGET_2ND_ARCH

  endif  # LOCAL_MODULE_CLASS



  my_dexpreopt_image_locations += $(DEXPREOPT_IMAGE_LOCATIONS_$(my_dexpreopt_infix))

  my_dexpreopt_image_locations_on_host += $(DEXPREOPT_IMAGE_LOCATIONS_ON_HOST$(my_dexpreopt_infix))

  my_dexpreopt_image_locations_on_device += $(DEXPREOPT_IMAGE_LOCATIONS_ON_DEVICE$(my_dexpreopt_infix))



  # Record dex-preopt config.

  DEXPREOPT.$(LOCAL_MODULE).DEX_PREOPT := $(LOCAL_DEX_PREOPT)
@@ -387,7 +389,8 @@ 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, DexPreoptImageLocationsOnHost,  $(my_dexpreopt_image_locations))

  $(call add_json_list, DexPreoptImageLocationsOnHost,  $(my_dexpreopt_image_locations_on_host))

  $(call add_json_list, DexPreoptImageLocationsOnDevice,$(my_dexpreopt_image_locations_on_device))

  $(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))