From 5f5e2362fae8af33c040398f44c7564d442ce20f Mon Sep 17 00:00:00 2001 From: yangbill Date: Wed, 13 Oct 2021 16:25:35 +0800 Subject: [PATCH] Add share_libs and system_share_libs to module-info Bug: 202922558 Bug: 204269866 Test: m out/target/product/vsoc_x86_64/module-info.json Change-Id: Idb4e66216cac4835968454f83196107f6bec4c1c --- core/base_rules.mk | 6 ++++++ core/tasks/module-info.mk | 2 ++ 2 files changed, 8 insertions(+) diff --git a/core/base_rules.mk b/core/base_rules.mk index 1b7a279db1..4e7b622bae 100644 --- a/core/base_rules.mk +++ b/core/base_rules.mk @@ -935,6 +935,12 @@ ifdef LOCAL_IS_HOST_MODULE my_required_modules += $(LOCAL_REQUIRED_MODULES_$($(my_prefix)OS)) endif +ALL_MODULES.$(my_register_name).SHARED_LIBS := \ + $(ALL_MODULES.$(my_register_name).SHARED_LIBS) $(LOCAL_SHARED_LIBRARIES) + +ALL_MODULES.$(my_register_name).SYSTEM_SHARED_LIBS := \ + $(ALL_MODULES.$(my_register_name).SYSTEM_SHARED_LIBS) $(LOCAL_SYSTEM_SHARED_LIBRARIES) + ########################################################################## ## When compiling against the VNDK, add the .vendor or .product suffix to ## required modules. diff --git a/core/tasks/module-info.mk b/core/tasks/module-info.mk index c8382643d5..5d5bfa8406 100644 --- a/core/tasks/module-info.mk +++ b/core/tasks/module-info.mk @@ -16,6 +16,8 @@ $(MODULE_INFO_JSON): '"module_name": "$(ALL_MODULES.$(m).MODULE_NAME)", ' \ '"test_config": [$(foreach w,$(strip $(ALL_MODULES.$(m).TEST_CONFIG) $(ALL_MODULES.$(m).EXTRA_TEST_CONFIGS)),"$(w)", )], ' \ '"dependencies": [$(foreach w,$(sort $(ALL_DEPS.$(m).ALL_DEPS)),"$(w)", )], ' \ + '"shared_libs": [$(foreach w,$(sort $(ALL_MODULES.$(m).SHARED_LIBS)),"$(w)", )], ' \ + '"system_shared_libs": [$(foreach w,$(sort $(ALL_MODULES.$(m).SYSTEM_SHARED_LIBS)),"$(w)", )], ' \ '"srcs": [$(foreach w,$(sort $(ALL_MODULES.$(m).SRCS)),"$(w)", )], ' \ '"srcjars": [$(foreach w,$(sort $(ALL_MODULES.$(m).SRCJARS)),"$(w)", )], ' \ '"classes_jar": [$(foreach w,$(sort $(ALL_MODULES.$(m).CLASSES_JAR)),"$(w)", )], ' \