Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 943fd2fa authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add share_libs and system_share_libs to module-info" am: dcb0e44c 

Original change: https://android-review.googlesource.com/c/platform/build/+/1855994

Change-Id: I68a7e42b3bd2b27e0c9ff8480f71af7aaf9dcb46
parents a7676b29 dcb0e44c

core/base_rules.mk

+6 −0
Original line number Diff line number Diff line
@@ -969,6 +969,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.

core/tasks/module-info.mk

+2 −0
Original line number Diff line number Diff line
@@ -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)", )], ' \