diff options
| author | Dmitriy Ivanov <dimitry@google.com> | 2014-05-22 01:22:00 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-05-22 01:22:00 +0000 |
| commit | 5caca89c5d66e9999e26905522bf2eed958d0961 (patch) | |
| tree | 60f0d0226f8ab1acb56be4de76a5093778a4faa6 | |
| parent | ea65c191e7c08233c97c5b854537d2a0d2127733 (diff) | |
| parent | 38bba065e096c18e12c0d08d586c1eee5c4179ae (diff) | |
| download | build-5caca89c5d66e9999e26905522bf2eed958d0961.tar.gz | |
Merge "Clarify multiarch warnings"
| -rw-r--r-- | core/shared_library.mk | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/core/shared_library.mk b/core/shared_library.mk index 178e625b92..71a3bb2681 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 |