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

am a530bd40: Merge "Also include the binaries for the 2nd arch."

Browse Source 
* commit 'a530bd4025ddf5d37510fca9de62e2dec3f2d7cb':
  Also include the binaries for the 2nd arch.
This commit is contained in:
Ying Wang
2014-06-16 23:50:26 +00:00
committed by Android Git Automerger
parent e6b3692b83 a530bd4025
commit fe86a7c153
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,10 +18,14 @@ my_pickup_files :=
# Calculate the dest files in the output zip file.
$(foreach m,$(my_modules),\
$(if $(ALL_MODULES.$(m).BUILT_INSTALLED),,\
$(eval _pickup_files := $(strip $(ALL_MODULES.$(m).PICKUP_FILES)\
$(ALL_MODULES.$(m)$(TARGET_2ND_ARCH_MODULE_SUFFIX).PICKUP_FILES)))\
$(eval _built_files := $(strip $(ALL_MODULES.$(m).BUILT_INSTALLED)\
$(ALL_MODULES.$(m)$(TARGET_2ND_ARCH_MODULE_SUFFIX).BUILT_INSTALLED)))\
$(if $(_pickup_files)$(_built_files),,\
$(warning Unknown installed file for module '$(m)'))\
$(eval my_pickup_files += $(ALL_MODULES.$(m).PICKUP_FILES))\
$(foreach i, $(ALL_MODULES.$(m).BUILT_INSTALLED),\
$(eval my_pickup_files += $(_pickup_files))\
$(foreach i, $(_built_files),\
$(eval bui_ins := $(subst :,$(space),$(i)))\
$(eval ins := $(word 2,$(bui_ins)))\
$(if $(filter $(TARGET_OUT_ROOT)/%,$(ins)),\