commit 62a73dbed0578da1997227902f2816616bdcfb5d
author Treehugger Robot <treehugger-gerrit@google.com> Sat May 08 21:38:02 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat May 08 21:38:02 2021 +0000
tree 03309b128f6dfc862b7b6c437d8aeaa149e9429d
parent 5a75afbede017ded55f2e0235bcb1e7e695b03cb
parent 7a2e4a990a2574a2269d92ecd5d5f8176168f837

Merge "DO NOT MERGE - Merge RQ2A.210505.003."

core/dex_preopt_odex_install.mk

diff --git a/core/dex_preopt_odex_install.mk b/core/dex_preopt_odex_install.mk
index c458dbb..d925899 100644
--- a/core/dex_preopt_odex_install.mk
+++ b/core/dex_preopt_odex_install.mk
@@ -389,7 +389,7 @@
   $(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,        $(my_dexpreopt_image_locations))
+  $(call add_json_list, DexPreoptImageLocationsOnHost,  $(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))