From c947b4a8aec947f4dd6177e3bbd692a144b0a60c Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Mon, 16 Jun 2014 15:14:45 -0700 Subject: [PATCH] Also include the binaries for the 2nd arch. Also include the binaries for the 2nd arch when building module packages. Change-Id: I50d2c7451a77cbccdb365c8efea6c77f5147fde6 --- core/tasks/tools/package-modules.mk | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/core/tasks/tools/package-modules.mk b/core/tasks/tools/package-modules.mk index 83d59849e7..f7e04ede93 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)),\