From d0378b3f2dbb5a5ff0cf0517354606f3f808d790 Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Fri, 24 Jan 2014 19:30:27 -0800
Subject: [PATCH] warn on LOCAL_MODULE_PATH in multiarch shared libraries

Using LOCAL_MODULE_PATH in a shared library module while building a
multiarch target will cause build rules for both architectures to install
into the same path.  Warn and suggest LOCAL_MODULE_RELATIVE_PATH.

Change-Id: I16208ccada6d43a26a342af35096f49d8df26e81
---
 core/shared_library.mk | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/core/shared_library.mk b/core/shared_library.mk
index b3e319fff..9a75a7b21 100644
--- a/core/shared_library.mk
+++ b/core/shared_library.mk
@@ -1,3 +1,15 @@
+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)
+endif
+endif
+
+ifneq ($(LOCAL_UNSTRIPPED_PATH),)
+ifneq ($(TARGET_2ND_ARCH),)
+$(warning $(LOCAL_MODULE): LOCAL_UNSTRIPPED_PATH for shared libraries is unsupported in multiarch builds)
+endif
+endif
+
 ifneq ($(TARGET_IS_64_BIT)|$(LOCAL_32BIT_ONLY),true|true)
 # Build for TARGET_ARCH
 LOCAL_2ND_ARCH_VAR_PREFIX :=