commit 5efc70689589019e04c1a5fe8975dc2671c9ac7b
author Dan Willemsen <dwillemsen@google.com> Fri May 27 15:23:38 2016 -0700
committer Dan Willemsen <dwillemsen@google.com> Fri May 27 15:23:38 2016 -0700
tree 85e6b7556f9e04bdbeb5d0d5abdb018fb65264b5
parent cd114c1cb707cb205ddf07e96bb61d97dfee5018

Export GLOBAL_[CLANG_]C[PP]FLAGS_NO_OVERRIDE to Make

Change-Id: I7f2f37f63720244eb1f3340804c00ae82d36e90b

cc/makevars.go

diff --git a/cc/makevars.go b/cc/makevars.go
index 58c8de8..863e3dc 100644
--- a/cc/makevars.go
+++ b/cc/makevars.go
@@ -36,6 +36,11 @@
 	ctx.Strict("LLVM_LINK", "${clangBin}/llvm-link")
 	ctx.StrictSorted("CLANG_CONFIG_UNKNOWN_CFLAGS", strings.Join(clangUnknownCflags, " "))
 
+	ctx.Strict("GLOBAL_CFLAGS_NO_OVERRIDE", "${noOverrideGlobalCflags}")
+	ctx.Strict("GLOBAL_CLANG_CFLAGS_NO_OVERRIDE", "${clangExtraNoOverrideCflags}")
+	ctx.Strict("GLOBAL_CPPFLAGS_NO_OVERRIDE", "")
+	ctx.Strict("GLOBAL_CLANG_CPPFLAGS_NO_OVERRIDE", "")
+
 	hostType := android.CurrentHostType()
 	arches := ctx.Config().HostArches[hostType]
 	makeVarsToolchain(ctx, "", android.Host, hostType, arches[0])