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

am: 60ee98582c

Change-Id: I6dc5be7db83465728c86e0a54c29a0bc1759a6f3
This commit is contained in:
Elliott Hughes
2019-10-16 09:14:06 -07:00
committed by android-build-merger

View File

@@ -309,7 +309,6 @@ func (compiler *baseCompiler) compilerFlags(ctx ModuleContext, flags Flags, deps
flags.SystemIncludeFlags = append(flags.SystemIncludeFlags, flags.SystemIncludeFlags = append(flags.SystemIncludeFlags,
"-isystem "+getCurrentIncludePath(ctx).String(), "-isystem "+getCurrentIncludePath(ctx).String(),
"-isystem "+getCurrentIncludePath(ctx).Join(ctx, config.NDKTriple(tc)).String()) "-isystem "+getCurrentIncludePath(ctx).Join(ctx, config.NDKTriple(tc)).String())
flags.GlobalFlags = append(flags.GlobalFlags, "-D__ANDROID_NDK__")
} }
if ctx.useVndk() { if ctx.useVndk() {