Merge \"Turn ndk link check warning into error\"

am: 32ebe53d01

Change-Id: I89ff2a720b27a288b9f64412dd213d7019ffca66
This commit is contained in:
Dan Willemsen 2016-07-12 21:19:46 +00:00 committed by android-build-merger
commit 95d3b735b6
1 changed files with 1 additions and 1 deletions

View File

@ -1273,7 +1273,7 @@ $(my_link_type): $(my_link_type_deps)
ifdef my_link_type_deps ifdef my_link_type_deps
$(hide) for f in $(PRIVATE_DEPS); do \ $(hide) for f in $(PRIVATE_DEPS); do \
grep -qE '^$(PRIVATE_ALLOWED_TYPES)$$' $$f || \ grep -qE '^$(PRIVATE_ALLOWED_TYPES)$$' $$f || \
$(call echo-warning,"$(PRIVATE_MAKEFILE): $(PRIVATE_MODULE) ($(PRIVATE_LINK_TYPE)) should not link to $$(basename $${f%_intermediates/link_type}) ($$(cat $$f))"); \ ($(call echo-error,"$(PRIVATE_MAKEFILE): $(PRIVATE_MODULE) ($(PRIVATE_LINK_TYPE)) should not link to $$(basename $${f%_intermediates/link_type}) ($$(cat $$f))"); exit 1) \
done done
endif endif
$(hide) echo $(PRIVATE_LINK_TYPE) >$@ $(hide) echo $(PRIVATE_LINK_TYPE) >$@