From: Pirama Arumuga Nainar <pirama@google.com>
Date: Tue, 28 Jun 2016 17:51:10 +0000 (-0700)
Subject: Disable warnings triggered in Clang r271374
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=df53be273509dd43725870fb20a2c7d71f7fbfd3;p=android-x86%2Fart.git

Disable warnings triggered in Clang r271374

http://b/28149048
http://b/29823425

Disable -Wconstant-conversion and -Wundefined-var-template.  The second
bug above tracks that these warnings get reenabled.

Test: Tested build, boot and common usage for Arm, Arm64, x86, x86_64,
Mips images in AOSP and internal branch.

Change-Id: Iea20cf6b5dbec3247b55cf8130f88202e786e367
---

diff --git a/build/Android.common_build.mk b/build/Android.common_build.mk
index bd13d1622..a679ac254 100644
--- a/build/Android.common_build.mk
+++ b/build/Android.common_build.mk
@@ -158,6 +158,10 @@ art_clang_cflags += -Wdeprecated
 # Enable warning for unreachable break & return.
 art_clang_cflags += -Wunreachable-code-break -Wunreachable-code-return
 
+# Bug: http://b/29823425  Disable -Wconstant-conversion and
+# -Wundefined-var-template for Clang update to r271374
+art_clang_cflags += -Wno-constant-conversion -Wno-undefined-var-template
+
 # Enable missing-noreturn only on non-Mac. As lots of things are not implemented for Apple, it's
 # a pain.
 ifneq ($(HOST_OS),darwin)