From f29481439809cbbb004aacf5e886aba68d26b5ba Mon Sep 17 00:00:00 2001
From: Tim Kilbourn <tkilbourn@google.com>
Date: Wed, 11 Mar 2015 12:03:03 -0700
Subject: [PATCH] Add common cpp flags

Change-Id: Iba486b121e9a1b0c1761cf6402c61a0228105a5b
---
 cc/cc.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/cc/cc.go b/cc/cc.go
index 641d67f79..0b595ecb6 100644
--- a/cc/cc.go
+++ b/cc/cc.go
@@ -86,6 +86,8 @@ func init() {
 		strings.Join(clangFilterUnknownCflags(deviceGlobalCflags), " "))
 	pctx.StaticVariable("hostClangGlobalCflags",
 		strings.Join(clangFilterUnknownCflags(hostGlobalCflags), " "))
+	pctx.StaticVariable("commonClangGlobalCppflags",
+		strings.Join(clangFilterUnknownCflags(commonGlobalCppflags), " "))
 
 	// Everything in this list is a crime against abstraction and dependency tracking.
 	// Do not add anything to this list.
@@ -387,6 +389,7 @@ func (c *ccBase) flags(ctx common.AndroidModuleContext, toolchain toolchain) ccF
 		}
 
 		if flags.clang {
+			flags.cppFlags = append(flags.cppFlags, "${commonClangGlobalCppflags}")
 			flags.globalFlags = []string{
 				"${commonGlobalIncludes}",
 				toolchain.IncludeFlags(),
@@ -395,6 +398,7 @@ func (c *ccBase) flags(ctx common.AndroidModuleContext, toolchain toolchain) ccF
 				fmt.Sprintf("${%sClangGlobalCflags}", arch.HostOrDevice),
 			}
 		} else {
+			flags.cppFlags = append(flags.cppFlags, "${commonGlobalCppflags}")
 			flags.globalFlags = []string{
 				"${commonGlobalIncludes}",
 				toolchain.IncludeFlags(),