diff options
| author | Ying Wang <wangying@google.com> | 2015-01-27 15:49:21 -0800 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2015-01-27 15:49:21 -0800 |
| commit | cb73599b25098b3513feda11ca5cb17d77fec83e (patch) | |
| tree | c26ffb8c2679aaeb5cfcb283a726331708a65c4b | |
| parent | 507ea383aaaea5634c79d20911773aa44324e7f5 (diff) | |
| download | build-cb73599b25098b3513feda11ca5cb17d77fec83e.zip build-cb73599b25098b3513feda11ca5cb17d77fec83e.tar.gz build-cb73599b25098b3513feda11ca5cb17d77fec83e.tar.bz2 | |
Make dangling module names in PRODUCT_FACTORY_RAMDISK_MODULES non-fatal.
It's pain to maintain an inactive product's list of
PRODUCT_FACTORY_RAMDISK_MODULES or PRODUCT_FACTORY_BUNDLE_MODULES.
Just show a warning if a module name becomes dangling.
Bug: 18779515
Change-Id: I3d137ed59feb005b186ed2a3519465da3d8f45c3
| -rw-r--r-- | core/tasks/factory_bundle.mk | 3 | ||||
| -rw-r--r-- | core/tasks/factory_ramdisk.mk | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/core/tasks/factory_bundle.mk b/core/tasks/factory_bundle.mk index 054a52a..51531cb 100644 --- a/core/tasks/factory_bundle.mk +++ b/core/tasks/factory_bundle.mk @@ -46,7 +46,7 @@ copied_files := \ $(eval _fb_m_name := $(word 1,$(_fb_m_tuple))) \ $(eval _fb_dests := $(wordlist 2,999,$(_fb_m_tuple))) \ $(eval _fb_m_built := $(filter $(HOST_OUT)/%, $(ALL_MODULES.$(_fb_m_name).BUILT))) \ - $(if $(_fb_m_built),,$(error no built file in requested_modules for '$(_fb_m_built)'))\ + $(if $(_fb_m_built),,$(warning no built file in requested_modules for '$(_fb_m_built)'))\ $(foreach _fb_f,$(_fb_dests),$(eval $(call copy-one-file,$(_fb_m_built),$(root_dir)/$(_fb_f))))\ $(addprefix $(root_dir)/,$(_fb_dests)) \ )) \ @@ -82,4 +82,3 @@ endif endif # TARGET_BUILD_PDK endif # ONE_SHOT_MAKEFILE - diff --git a/core/tasks/factory_ramdisk.mk b/core/tasks/factory_ramdisk.mk index 00fcdde..d65d931 100644 --- a/core/tasks/factory_ramdisk.mk +++ b/core/tasks/factory_ramdisk.mk @@ -44,7 +44,7 @@ $(if $(filter 1,$(words $(_iofrm_src))), \ $(eval _fulldest := $(TARGET_FACTORY_RAMDISK_OUT)/$(1)) \ $(eval $(call copy-one-file,$(_iofrm_src),$(_fulldest))) \ $(eval INTERNAL_FACTORY_RAMDISK_EXTRA_MODULES_FILES += $(_fulldest)), \ - $(error Error: Cannot find match in "$(2)" for "$(1)") \ + $(warning Warning: Cannot find built file in "$(2)" for "$(1)") \ ) endef |