Merge "Revert "-D__ANDROID_NDK__ for SDK builds."" am: 60ee98582c
am: 3fb7864cf1
Change-Id: I58bfea1b04c5a3b06091e84118b10634e7c87356
This commit is contained in:
@@ -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() {
|
||||||
|
Reference in New Issue
Block a user