StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am aeaa0f5c: Merge "Turn shared library multilib warnings into errors"

Browse Source 
* commit 'aeaa0f5c580356c0d74dd11e00fb29ae67d97f2b':
  Turn shared library multilib warnings into errors
This commit is contained in:
Dan Willemsen
2015-09-24 21:38:46 +00:00
committed by Android Git Automerger
parent 34f7562e86 aeaa0f5c58
commit af6d2d8754
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/shared_library.mk
View File

@@ -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