commit 3bd5abb4f9dbf44ac22a41d7770cc4b12c3b7d53
author Brian Carlstrom <bdc@google.com> Tue Jun 17 23:38:48 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Jun 17 23:38:48 2014 +0000
tree 0a6c1aa9c9fdd56b106b6ffb29292ac95ff1afaf
parent b8b0302eea8f8a80f9893bc031099b4b35bd4922
parent a44f9a35a284c600616a7f2213a861ecdefd5615

am a44f9a35: am edbc4595: am d51730a6: Merge "Help catch common 32/64-bit errors."

* commit 'a44f9a35a284c600616a7f2213a861ecdefd5615':
  Help catch common 32/64-bit errors.

core/clang/config.mk

diff --git a/core/clang/config.mk b/core/clang/config.mk
index 1125368..1de46f0 100644
--- a/core/clang/config.mk
+++ b/core/clang/config.mk
@@ -24,9 +24,13 @@
 CLANG_CONFIG_EXTRA_CPPFLAGS :=
 CLANG_CONFIG_EXTRA_LDFLAGS :=
 
-CLANG_CONFIG_EXTRA_CFLAGS := \
+CLANG_CONFIG_EXTRA_CFLAGS += \
   -D__compiler_offsetof=__builtin_offsetof
 
+# Help catch common 32/64-bit errors.
+CLANG_CONFIG_EXTRA_CFLAGS += \
+  -Werror=int-conversion
+
 CLANG_CONFIG_UNKNOWN_CFLAGS := \
   -funswitch-loops \
   -fno-tree-sra \