commit 1047a0a4be5b8c5493bbaecaf02e4a821aa892a9
author Ulya Trafimovich <skvadrik@google.com> Tue Dec 08 23:37:58 2020 +0000
committer Ulya Trafimovich <skvadrik@google.com> Fri Jan 22 12:00:24 2021 +0000
tree 56c1aef5bf6019639df3632e5123b1219deac3a6
parent e9df7af1edd324f69d51ceae6eee7f58993ef5f8

Add subcontexts field to JSON class loader context representation.

For now the subcontexts are always empty. A follow-up change will
actually populate that field from dependencies' dexpreopt.config files.

Bug: 132357300
Test: lunch aosp_cf_x86_phone-userdebug && m
Change-Id: I6cf0e8363dff4b406cb62ba3d76d566dbfec57e7

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)