Emit DexPreoptImageLocationsOnDevice as well
Bug: 158843648 Test: check if dexpreopt config for the module defined in mk has DexPreoptImageLocationsOnDevice field. Change-Id: Ie8c7b1c8c5a6797f71920d9ce671dde0e1f489a3
This commit is contained in:
parent
757e2e1fc1
commit
242c436242
1 changed files with 6 additions and 3 deletions
|
@ -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))
|
||||
|
|
Loading…
Reference in a new issue