commit 043eab7ad39e39fba75f0ba41a6652f777f03f7b
author Steven Moreland <smoreland@google.com> Thu Aug 08 09:56:14 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu Aug 08 09:56:14 2019 -0700
tree ef11727612516c0573289d6df587c0d1fa92aa5a
parent 73d9ff761ff4e4253e5cc2793d3932b9c4273c46
parent 08f92625778131b442d2520ca01183df52ac2928

Merge "-D__ANDROID_NDK__ for SDK builds."
am: 08f9262577

Change-Id: I79f4746e3f9096f36b19eb2c0ac0c720a6410c52

cc/compiler.go

diff --git a/cc/compiler.go b/cc/compiler.go
index ffb6ad2..85ff400 100644
--- a/cc/compiler.go
+++ b/cc/compiler.go
@@ -309,6 +309,7 @@
 		flags.SystemIncludeFlags = append(flags.SystemIncludeFlags,
 			"-isystem "+getCurrentIncludePath(ctx).String(),
 			"-isystem "+getCurrentIncludePath(ctx).Join(ctx, config.NDKTriple(tc)).String())
+		flags.GlobalFlags = append(flags.GlobalFlags, "-D__ANDROID_NDK__")
 	}
 
 	if ctx.useVndk() {