commit 0d20c7cf5e93ca1afa4130c6a0e22f54e26770f7
author Ulyana Trafimovich <skvadrik@google.com> Mon Jan 25 14:32:23 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jan 25 14:32:23 2021 +0000
tree d3faa5c744d38a110222229d240aea90934b1710
parent c12f1084c0b9cecbc9db5ed95f53bf10bf5d453d
parent 1047a0a4be5b8c5493bbaecaf02e4a821aa892a9

Merge "Add subcontexts field to JSON class loader context representation."

core/dex_preopt_odex_install.mk

diff --git a/core/dex_preopt_odex_install.mk b/core/dex_preopt_odex_install.mk
index c31d4e8..cdd96f6 100644
--- a/core/dex_preopt_odex_install.mk
+++ b/core/dex_preopt_odex_install.mk
@@ -220,8 +220,9 @@
     $(foreach lib, $(2),\
       $(call add_json_map, $(lib)) \
       $(eval file := $(filter %/$(lib).jar, $(call module-installed-files,$(lib)))) \
-      $(call add_json_str, Host,       $(call intermediates-dir-for,JAVA_LIBRARIES,$(lib),,COMMON)/javalib.jar) \
-      $(call add_json_str, Device,     $(call install-path-to-on-device-path,$(file))) \
+      $(call add_json_str, Host,        $(call intermediates-dir-for,JAVA_LIBRARIES,$(lib),,COMMON)/javalib.jar) \
+      $(call add_json_str, Device,      $(call install-path-to-on-device-path,$(file))) \
+      $(call add_json_map, Subcontexts, ${$}) $(call end_json_map) \
       $(call end_json_map)) \
     $(call end_json_map)