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

am: 32ebd00639

Change-Id: I1fc7a813ce5843bb0a8fb37708e8ebf95e02bf36
This commit is contained in:
Elliott Hughes
2019-10-16 09:27:20 -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,
"-isystem "+getCurrentIncludePath(ctx).String(),
"-isystem "+getCurrentIncludePath(ctx).Join(ctx, config.NDKTriple(tc)).String())
flags.GlobalFlags = append(flags.GlobalFlags, "-D__ANDROID_NDK__")
}
if ctx.useVndk() {