commit a7295286510c5d8000c73205affdaac2123dce4a
author Ying Wang <wangying@google.com> Tue Dec 20 17:36:42 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Tue Dec 20 17:36:42 2011 -0800
tree f40355f80bfa88312ce030057ffa801af6558863
parent be47fc177dad321a6ffb61201273dcee38648cdc
parent 0d75a0a54c5ecc0dd1580a7c3da0e0b0aa49bd25

Merge "Filter out static library in PRODUCT_FACTORY_RAMDISK_MODULES"

core/tasks/factory_ramdisk.mk

diff --git a/core/tasks/factory_ramdisk.mk b/core/tasks/factory_ramdisk.mk
index c4d792c..7b78657 100644
--- a/core/tasks/factory_ramdisk.mk
+++ b/core/tasks/factory_ramdisk.mk
@@ -25,8 +25,10 @@
 $(foreach m, $(factory_ramdisk_modules), \
     $(eval _fr_m_name := $(call word-colon,1,$(m))) \
     $(eval _fr_dest := $(call word-colon,2,$(m))) \
-    $(eval _fr_m_built := $(filter $(PRODUCT_OUT)/%, $(ALL_MODULES.$(_fr_m_name).BUILT))) \
+    $(eval _fr_m_built := $(filter-out %.a, $(filter $(PRODUCT_OUT)/%, $(ALL_MODULES.$(_fr_m_name).BUILT)))) \
     $(if $(_fr_m_built), \
+        $(if $(filter-out 1, $(words $(_fr_m_built))), \
+            $(error Error: module "$(m)" has multiple built files: "$(_fr_m_built)")) \
         $(eval _fulldest := $(TARGET_FACTORY_RAMDISK_OUT)/$(_fr_dest)) \
         $(eval $(call copy-one-file,$(_fr_m_built),$(_fulldest))) \
         $(eval INTERNAL_FACTORY_RAMDISK_EXTRA_MODULES_FILES += $(_fulldest)), \