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

Commit deaf2481 authored by zijunzhao's avatar zijunzhao
Browse files

Add GLOBAL_CLANG_CFLAGS_64_NO_OVERRIDE support to Make 

Bug: b/261642850
Test: Build and check warnings. Add two xfail tests in art and see the
results locally.

Change-Id: I122ee2cbfa37bdb71026781efe6cb7131b873ae0
parent 5b00c195

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)