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

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

Browse Source
This commit is contained in:
Ying Wang
2014-01-22 03:48:59 +00:00
committed by Gerrit Code Review
parent 8d1f91fa54 06b3255118
commit 62043de346
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/Makefile
View File

@@ -20,7 +20,7 @@ is_tests_build := $(filter tests,$(MAKECMDGOALS))
# src:dest pair is the first one to match the same dest" # src:dest pair is the first one to match the same dest"
#$(1): the src:dest pair #$(1): the src:dest pair
define check-product-copy-files 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!)) Prebuilt apk found in PRODUCT_COPY_FILES: $(1), use BUILD_PREBUILT instead!))
endef endef
# filter out the duplicate <source file>:<dest file> pairs. # filter out the duplicate <source file>:<dest file> pairs.