From 82f0a2d751f7349b2b7e08f68ae5291f618d2ea7 Mon Sep 17 00:00:00 2001 From: Yike Date: Wed, 31 Aug 2022 17:46:13 +0800 Subject: [PATCH] Export Java libraries into module-info Some Java modules are defined in Android.mk and they declare dependencies in eigther LOCAL_STATIC_JAVA_LIBRARIES or LOCAL_JAVA_LIBRARIES. This information needs to present in module_info.json and be exported to properly generate Bazel targets that include these dependencies. Test: m out/target/product/coral/module-info.json Bug: 245686435 Change-Id: I77bc8de59f1d46bb098463066e1f52b98ebae955 --- core/base_rules.mk | 6 +++++- core/tasks/module-info.mk | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/core/base_rules.mk b/core/base_rules.mk index 9bb6c4718a..046239e6a3 100644 --- a/core/base_rules.mk +++ b/core/base_rules.mk @@ -1012,7 +1012,11 @@ ALL_MODULES.$(my_register_name).SYSTEM_SHARED_LIBS := \ $(ALL_MODULES.$(my_register_name).SYSTEM_SHARED_LIBS) $(LOCAL_SYSTEM_SHARED_LIBRARIES) ALL_MODULES.$(my_register_name).LOCAL_RUNTIME_LIBRARIES := \ - $(ALL_MODULES.$(my_register_name).LOCAL_RUNTIME_LIBRARIES) $(LOCAL_RUNTIME_LIBRARIES) + $(ALL_MODULES.$(my_register_name).LOCAL_RUNTIME_LIBRARIES) $(LOCAL_RUNTIME_LIBRARIES) \ + $(LOCAL_JAVA_LIBRARIES) + +ALL_MODULES.$(my_register_name).LOCAL_STATIC_LIBRARIES := \ + $(ALL_MODULES.$(my_register_name).LOCAL_STATIC_LIBRARIES) $(LOCAL_STATIC_JAVA_LIBRARIES) ifdef LOCAL_TEST_DATA # Export the list of targets that are handled as data inputs and required diff --git a/core/tasks/module-info.mk b/core/tasks/module-info.mk index 0b93a9ec76..7e7abd22e9 100644 --- a/core/tasks/module-info.mk +++ b/core/tasks/module-info.mk @@ -27,6 +27,7 @@ $(MODULE_INFO_JSON): '"test_options_tags": [$(foreach w,$(sort $(ALL_MODULES.$(m).TEST_OPTIONS_TAGS)),"$(w)", )], ' \ '"data": [$(foreach w,$(sort $(ALL_MODULES.$(m).TEST_DATA)),"$(w)", )], ' \ '"runtime_dependencies": [$(foreach w,$(sort $(ALL_MODULES.$(m).LOCAL_RUNTIME_LIBRARIES)),"$(w)", )], ' \ + '"static_dependencies": [$(foreach w,$(sort $(ALL_MODULES.$(m).LOCAL_STATIC_LIBRARIES)),"$(w)", )], ' \ '"data_dependencies": [$(foreach w,$(sort $(ALL_MODULES.$(m).TEST_DATA_BINS)),"$(w)", )], ' \ '"supported_variants": [$(foreach w,$(sort $(ALL_MODULES.$(m).SUPPORTED_VARIANTS)),"$(w)", )], ' \ '"host_dependencies": [$(foreach w,$(sort $(ALL_MODULES.$(m).HOST_REQUIRED_FROM_TARGET)),"$(w)", )], ' \