From 1047a0a4be5b8c5493bbaecaf02e4a821aa892a9 Mon Sep 17 00:00:00 2001 From: Ulya Trafimovich Date: Tue, 8 Dec 2020 23:37:58 +0000 Subject: [PATCH] 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 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/core/dex_preopt_odex_install.mk b/core/dex_preopt_odex_install.mk index c31d4e85c..cdd96f69c 100644 --- a/core/dex_preopt_odex_install.mk +++ b/core/dex_preopt_odex_install.mk @@ -220,8 +220,9 @@ ifdef LOCAL_DEX_PREOPT $(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)