summaryrefslogtreecommitdiffstats
path: root/core/shared_library.mk
diff options
context:
space:
mode:
authorDmitriy Ivanov <dimitry@google.com>2014-05-21 16:38:03 -0700
committerDmitriy Ivanov <dimitry@google.com>2014-05-21 16:40:35 -0700
commit38bba065e096c18e12c0d08d586c1eee5c4179ae (patch)
tree1f2ddcc99213e9c50e1652a84ec61675479fb9a3 /core/shared_library.mk
parent90a0edbc0b6dfee222ff630973308c737202a6b7 (diff)
downloadbuild-38bba065e096c18e12c0d08d586c1eee5c4179ae.tar.gz
build-38bba065e096c18e12c0d08d586c1eee5c4179ae.tar.bz2
build-38bba065e096c18e12c0d08d586c1eee5c4179ae.zip
Clarify multiarch warnings
* Show multiarch related warnings only if my_module_multilib is both Change-Id: If0c467c1d9b953bd3f40949ab4b97d9329ec021f
Diffstat (limited to 'core/shared_library.mk')
-rw-r--r--core/shared_library.mk17
1 files changed, 10 insertions, 7 deletions
diff --git a/core/shared_library.mk b/core/shared_library.mk
index 178e625b9..71a3bb268 100644
--- a/core/shared_library.mk
+++ b/core/shared_library.mk
@@ -1,3 +1,12 @@
+my_prefix := TARGET_
+include $(BUILD_SYSTEM)/multilib.mk
+
+ifndef my_module_multilib
+# libraries default to building for both architecturess
+my_module_multilib := both
+endif
+
+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)
@@ -9,14 +18,8 @@ ifneq ($(TARGET_2ND_ARCH),)
$(warning $(LOCAL_MODULE): LOCAL_UNSTRIPPED_PATH for shared libraries is unsupported in multiarch builds)
endif
endif
+endif # my_module_multilib == both
-my_prefix := TARGET_
-include $(BUILD_SYSTEM)/multilib.mk
-
-ifndef my_module_multilib
-# libraries default to building for both architecturess
-my_module_multilib := both
-endif
LOCAL_2ND_ARCH_VAR_PREFIX :=
include $(BUILD_SYSTEM)/module_arch_supported.mk