Merge "-D__ANDROID_NDK__ for SDK builds." am: 08f9262577 am: 043eab7ad3 am: 681b67e8ad

am: 584d5b0100 Change-Id: I39bdcd2a3445cd7531335c2876d0a88ba0381337
2019-08-08 10:27:02 -07:00
parent e075cb6b38 584d5b0100
commit 5075531ceb
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() {