Merge "Add GLOBAL_CLANG_CFLAGS_64_NO_OVERRIDE support to Make" am: 13556c40c3
Original change: https://android-review.googlesource.com/c/platform/build/+/2402512 Change-Id: Iba0b314bbe07804be31346a52e23d217b81b918c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
e3942c7222
1 changed files with 3 additions and 0 deletions
|
@ -58,6 +58,9 @@ my_conlyflags := $(LOCAL_CONLYFLAGS)
|
|||
my_cppflags := $(LOCAL_CPPFLAGS)
|
||||
my_cflags_no_override := $(GLOBAL_CLANG_CFLAGS_NO_OVERRIDE)
|
||||
my_cppflags_no_override := $(GLOBAL_CLANG_CPPFLAGS_NO_OVERRIDE)
|
||||
ifeq ($(my_32_64_bit_suffix), 64)
|
||||
my_cflags_no_override += $(GLOBAL_CLANG_CFLAGS_64_NO_OVERRIDE)
|
||||
endif
|
||||
ifdef is_third_party
|
||||
my_cflags_no_override += $(GLOBAL_CLANG_EXTERNAL_CFLAGS_NO_OVERRIDE)
|
||||
my_cppflags_no_override += $(GLOBAL_CLANG_EXTERNAL_CFLAGS_NO_OVERRIDE)
|
||||
|
|
Loading…
Reference in a new issue