Revert "Fix filter rule when checking for apks in PRODUCT_COPY_FILES."

This reverts commit ca37190711ca48a6bfd6b5700a54cd580abd1e5b.

Change-Id: I3a76f4cdf92ecbe3059bf5856cf341874e1393cf

diff --git a/core/Makefile b/core/Makefile
index e99f49d..2bcf0cf 100644 (file)
--- a/core/Makefile
+++ b/core/Makefile
@@ -20,7 +20,7 @@ is_tests_build := $(filter tests,$(MAKECMDGOALS))
 # src:dest pair is the first one to match the same dest"
 #$(1): the src:dest pair
 define check-product-copy-files
-$(if $(filter %.apk, $(call word-colon, 2, $(1))),$(error \
+$(if $(filter %.apk, $(1)),$(error \
     Prebuilt apk found in PRODUCT_COPY_FILES: $(1), use BUILD_PREBUILT instead!))
 endef
 # filter out the duplicate <source file>:<dest file> pairs.