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

am: 043eab7ad3 Change-Id: Ic75be51db6a2b079fe645a98c1aa78d6d1156ac2
2019-08-08 10:05:49 -07:00
parent fcd053fdc0 043eab7ad3
commit 681b67e8ad
1 changed files with 1 additions and 0 deletions
--- a/cc/compiler.go
+++ b/cc/compiler.go
@@ -309,6 +309,7 @@ func (compiler *baseCompiler) compilerFlags(ctx ModuleContext, flags Flags, deps
 		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() {