diff options
| author | Ying Wang <wangying@google.com> | 2014-06-16 15:14:45 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2014-06-16 16:42:10 -0700 |
| commit | ec45d37242a3c5ef109f8be1f18e5534e873844b (patch) | |
| tree | 48bbf40f9c0e29add151f15fc19e80c85ecef250 /core/tasks | |
| parent | 74c9850c795303b2ee60e5c4d8494385e0e57d58 (diff) | |
| download | build-ec45d37242a3c5ef109f8be1f18e5534e873844b.zip build-ec45d37242a3c5ef109f8be1f18e5534e873844b.tar.gz build-ec45d37242a3c5ef109f8be1f18e5534e873844b.tar.bz2 | |
Also include the binaries for the 2nd arch.
Also include the binaries for the 2nd arch when building module
packages.
Change-Id: I50d2c7451a77cbccdb365c8efea6c77f5147fde6
Diffstat (limited to 'core/tasks')
| -rw-r--r-- | core/tasks/tools/package-modules.mk | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/core/tasks/tools/package-modules.mk b/core/tasks/tools/package-modules.mk index 83d5984..f7e04ed 100644 --- a/core/tasks/tools/package-modules.mk +++ b/core/tasks/tools/package-modules.mk @@ -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)),\ |