Merge "Revert "-D__ANDROID_NDK__ for SDK builds.""

am: 60ee98582c Change-Id: I6dc5be7db83465728c86e0a54c29a0bc1759a6f3
2019-10-16 09:14:06 -07:00
parent 2f0c56e0cf 60ee98582c
commit 3fb7864cf1
1 changed files with 0 additions and 1 deletions
--- a/cc/compiler.go
+++ b/cc/compiler.go
@@ -309,7 +309,6 @@ 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() {