commit deaf24812dbbd5740b623c283f17e381561c76ea
author zijunzhao <zijunzhao@google.com> Wed Jan 25 04:06:34 2023 +0000
committer zijunzhao <zijunzhao@google.com> Wed Jan 25 04:06:34 2023 +0000
tree d0062cb6c22614464338e8eecd8cc736bf150dad
parent 5b00c1955831d3b652792a9e2edbbbf779b51c8e

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

core/binary.mk

diff --git a/core/binary.mk b/core/binary.mk
index 6320726..6f1d814 100644
--- a/core/binary.mk
+++ b/core/binary.mk
@@ -58,6 +58,9 @@
 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)