diff options
| author | Ying Wang <wangying@google.com> | 2015-01-28 00:06:17 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-28 00:06:17 +0000 |
| commit | 75705338b7e8e1353503b53f10274fda5c3cf7bf (patch) | |
| tree | b4c61f32e2f1e72c46f463807b8b87d7d9542c65 /core/tasks | |
| parent | d22d6a537d59e1453bc728810a0694f8871deedc (diff) | |
| parent | 1c1497a7f6c07899feae0ae57a7e2003d60045ae (diff) | |
| download | build-75705338b7e8e1353503b53f10274fda5c3cf7bf.zip build-75705338b7e8e1353503b53f10274fda5c3cf7bf.tar.gz build-75705338b7e8e1353503b53f10274fda5c3cf7bf.tar.bz2 | |
am 1c1497a7: am cb73599b: Make dangling module names in PRODUCT_FACTORY_RAMDISK_MODULES non-fatal.
* commit '1c1497a7f6c07899feae0ae57a7e2003d60045ae':
Make dangling module names in PRODUCT_FACTORY_RAMDISK_MODULES non-fatal.
Diffstat (limited to 'core/tasks')
| -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 |