StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 1c1497a7: am cb73599b: Make dangling module names in PRODUCT_FACTORY_RAMDISK_MODULES non-fatal.

Browse Source 
* commit '1c1497a7f6c07899feae0ae57a7e2003d60045ae':
  Make dangling module names in PRODUCT_FACTORY_RAMDISK_MODULES non-fatal.
This commit is contained in:
Ying Wang
2015-01-28 00:06:17 +00:00
committed by Android Git Automerger
parent d22d6a537d 1c1497a7f6
commit 75705338b7
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/tasks/factory_bundle.mk
View File

@@ -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

2
core/tasks/factory_ramdisk.mk
View File

@@ -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