Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7cc88b79 authored by Dan Willemsen's avatar Dan Willemsen
Browse files

Turn shared library multilib warnings into errors 

When caught later, these just get turned into warnings with
unpredictable results, or non-obvious errors.

Change-Id: Ie7ba88e97dc5bedd6cf850748d79693711ac41da
parent 3f107055

core/shared_library.mk

+2 −2
Original line number Original line Diff line number Diff line
@@ -9,13 +9,13 @@ endif 
ifeq ($(my_module_multilib),both)

ifeq ($(my_module_multilib),both)

ifneq ($(LOCAL_MODULE_PATH),)

ifneq ($(LOCAL_MODULE_PATH),)

ifneq ($(TARGET_2ND_ARCH),)

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

endif

endif





ifneq ($(LOCAL_UNSTRIPPED_PATH),)

ifneq ($(LOCAL_UNSTRIPPED_PATH),)

ifneq ($(TARGET_2ND_ARCH),)

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

endif

endif # my_module_multilib == both

endif # my_module_multilib == both