Merge "Output of an apex module type can be included in tests"
diff --git a/cc/config/clang.go b/cc/config/clang.go
index d0d199b..c070bf2 100644
--- a/cc/config/clang.go
+++ b/cc/config/clang.go
@@ -120,9 +120,6 @@
// color codes if it is not running in a terminal.
"-fcolor-diagnostics",
- // http://b/29823425 Disable -Wexpansion-to-defined for Clang update to r271374
- "-Wno-expansion-to-defined",
-
// http://b/68236239 Allow 0/NULL instead of using nullptr everywhere.
"-Wno-zero-as-null-pointer-constant",