Merge "Revert "-D__ANDROID_NDK__ for SDK builds."" am: 60ee98582c

am: 3fb7864cf1 Change-Id: I58bfea1b04c5a3b06091e84118b10634e7c87356
2019-10-16 09:21:22 -07:00
parent a449e6dd8b 3fb7864cf1
commit 32ebd00639
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() {