StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Include the LOCAL_REQUIRED_MODULES when packaging." am: 06f3258694 am: 2ee71f6946 am: af5554c699

Browse Source 
am: 0f9093a31c

Change-Id: Ib02724ee1825334069e48af6b7342364b759fbe4
This commit is contained in:
Alex Deymo
2017-02-13 16:15:10 +00:00
committed by android-build-merger
parent 582bed9886 0f9093a31c
commit df32f43f1e
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/base_rules.mk
View File

@@ -537,6 +537,9 @@ my_required_modules += $(LOCAL_REQUIRED_MODULES_$($(my_prefix)OS))
endif endif
ALL_MODULES.$(my_register_name).REQUIRED := \ ALL_MODULES.$(my_register_name).REQUIRED := \
$(strip $(ALL_MODULES.$(my_register_name).REQUIRED) $(my_required_modules)) $(strip $(ALL_MODULES.$(my_register_name).REQUIRED) $(my_required_modules))
ALL_MODULES.$(my_register_name).EXPLICITLY_REQUIRED := \
$(strip $(ALL_MODULES.$(my_register_name).EXPLICITLY_REQUIRED)\
$(my_required_modules))
ALL_MODULES.$(my_register_name).EVENT_LOG_TAGS := \ ALL_MODULES.$(my_register_name).EVENT_LOG_TAGS := \
$(ALL_MODULES.$(my_register_name).EVENT_LOG_TAGS) $(event_log_tags) $(ALL_MODULES.$(my_register_name).EVENT_LOG_TAGS) $(event_log_tags)
ALL_MODULES.$(my_register_name).MAKEFILE := \ ALL_MODULES.$(my_register_name).MAKEFILE := \

12
core/tasks/tools/package-modules.mk
View File

@@ -14,10 +14,20 @@ my_built_modules :=
my_copy_pairs := my_copy_pairs :=
my_pickup_files := my_pickup_files :=
# Iterate over the modules and include their direct dependencies stated in the
# LOCAL_REQUIRED_MODULES.
my_modules_and_deps := $(my_modules)
$(foreach m,$(my_modules),\
$(eval _explicitly_required := \
$(strip $(ALL_MODULES.$(m).EXPLICITLY_REQUIRED)\
$(ALL_MODULES.$(m)$(TARGET_2ND_ARCH_MODULE_SUFFIX).EXPLICITLY_REQUIRED)))\
$(eval my_modules_and_deps += $(_explicitly_required))\
)
# Iterate over modules' built files and installed files; # Iterate over modules' built files and installed files;
# Calculate the dest files in the output zip file. # Calculate the dest files in the output zip file.
$(foreach m,$(my_modules),\ $(foreach m,$(my_modules_and_deps),\
$(eval _pickup_files := $(strip $(ALL_MODULES.$(m).PICKUP_FILES)\ $(eval _pickup_files := $(strip $(ALL_MODULES.$(m).PICKUP_FILES)\
$(ALL_MODULES.$(m)$(TARGET_2ND_ARCH_MODULE_SUFFIX).PICKUP_FILES)))\ $(ALL_MODULES.$(m)$(TARGET_2ND_ARCH_MODULE_SUFFIX).PICKUP_FILES)))\
$(eval _built_files := $(strip $(ALL_MODULES.$(m).BUILT_INSTALLED)\ $(eval _built_files := $(strip $(ALL_MODULES.$(m).BUILT_INSTALLED)\