From 0d75a0a54c5ecc0dd1580a7c3da0e0b0aa49bd25 Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Tue, 20 Dec 2011 17:25:31 -0800 Subject: [PATCH] Filter out static library in PRODUCT_FACTORY_RAMDISK_MODULES If there is shared library with the same name. Change-Id: Iaa43219cab7737c02a79d168f13ad4c473421f24 --- core/tasks/factory_ramdisk.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/tasks/factory_ramdisk.mk b/core/tasks/factory_ramdisk.mk index c4d792cd1..7b78657f6 100644 --- a/core/tasks/factory_ramdisk.mk +++ b/core/tasks/factory_ramdisk.mk @@ -25,8 +25,10 @@ INTERNAL_FACTORY_RAMDISK_EXTRA_MODULES_FILES := $(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)), \ -- 2.11.0