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

Commit a15121ba authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add GLOBAL_CLANG_CFLAGS_64_NO_OVERRIDE support to Make" am: 13556c40 am: e3942c72 

Original change: https://android-review.googlesource.com/c/platform/build/+/2402512



Change-Id: I67809531682b9bb6d485a951d0c0e8f4950d332a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3bf93f2f e3942c72

core/binary.mk

+3 −0
Original line number Diff line number Diff line
@@ -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)