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

2019-10-16 16:01:14 +00:00
parent 49a1384b11 a11242da49
commit 60ee98582c
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() {