Merge "-D__ANDROID_NDK__ for SDK builds." am: 08f9262577 am: 043eab7ad3

am: 681b67e8ad

Change-Id: Ic5c86edbda5cbd8c0c4de3f6b13f0c1454c8309a
This commit is contained in:
Steven Moreland
2019-08-08 10:17:15 -07:00
committed by android-build-merger

View File

@@ -309,6 +309,7 @@ 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() {