commit aeaa0f5c580356c0d74dd11e00fb29ae67d97f2b
author Dan Willemsen <dwillemsen@google.com> Thu Sep 24 20:59:20 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Sep 24 20:59:20 2015 +0000
tree ed95d1eced605be36aa035965726b39df9a2562d
parent 3f10705579deae60d9b903a4587a66a26112ee4a
parent 7cc88b794d0e30bafdb70394bd55afee0f5d4801

Merge "Turn shared library multilib warnings into errors"

core/shared_library.mk

diff --git a/core/shared_library.mk b/core/shared_library.mk
index 71a3bb2..73aca78c 100644
--- a/core/shared_library.mk
+++ b/core/shared_library.mk
@@ -9,13 +9,13 @@
 ifeq ($(my_module_multilib),both)
 ifneq ($(LOCAL_MODULE_PATH),)
 ifneq ($(TARGET_2ND_ARCH),)
-$(warning $(LOCAL_MODULE): LOCAL_MODULE_PATH for shared libraries is unsupported in multiarch builds, use LOCAL_MODULE_RELATIVE_PATH instead)
+$(error $(LOCAL_MODULE): LOCAL_MODULE_PATH for shared libraries is unsupported in multiarch builds, use LOCAL_MODULE_RELATIVE_PATH instead)
 endif
 endif
 
 ifneq ($(LOCAL_UNSTRIPPED_PATH),)
 ifneq ($(TARGET_2ND_ARCH),)
-$(warning $(LOCAL_MODULE): LOCAL_UNSTRIPPED_PATH for shared libraries is unsupported in multiarch builds)
+$(error $(LOCAL_MODULE): LOCAL_UNSTRIPPED_PATH for shared libraries is unsupported in multiarch builds)
 endif
 endif
 endif # my_module_multilib == both