diff options
| author | Ying Wang <wangying@google.com> | 2014-06-16 23:42:56 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-16 23:42:56 +0000 |
| commit | d64f3c6ee64821951e2c3eb519044389cb0ffbfc (patch) | |
| tree | de6c99eaa754ea4b6f58d56236dba8867b41af59 /core/tasks | |
| parent | 7ec725d41fc96e97a3c14b76b38089d461a79c7f (diff) | |
| parent | c947b4a8aec947f4dd6177e3bbd692a144b0a60c (diff) | |
| download | build-d64f3c6ee64821951e2c3eb519044389cb0ffbfc.zip build-d64f3c6ee64821951e2c3eb519044389cb0ffbfc.tar.gz build-d64f3c6ee64821951e2c3eb519044389cb0ffbfc.tar.bz2 | |
am c947b4a8: Also include the binaries for the 2nd arch.
* commit 'c947b4a8aec947f4dd6177e3bbd692a144b0a60c':
Also include the binaries for the 2nd arch.
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)),\ |