diff options
Diffstat (limited to 'cc/makevars.go')
| -rw-r--r-- | cc/makevars.go | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/cc/makevars.go b/cc/makevars.go index 11c316225..294f3e65b 100644 --- a/cc/makevars.go +++ b/cc/makevars.go @@ -82,6 +82,16 @@ func makeVarsProvider(ctx android.MakeVarsContext) { ctx.Strict("RS_GLOBAL_INCLUDES", "${config.RsGlobalIncludes}") + nativeHelperIncludeFlags, err := ctx.Eval("${config.CommonNativehelperInclude}") + if err != nil { + panic(err) + } + nativeHelperIncludes, nativeHelperSystemIncludes := splitSystemIncludes(ctx, nativeHelperIncludeFlags) + if len(nativeHelperSystemIncludes) > 0 { + panic("native helper may not have any system includes") + } + ctx.Strict("JNI_H_INCLUDE", strings.Join(nativeHelperIncludes, " ")) + includeFlags, err := ctx.Eval("${config.CommonGlobalIncludes}") if err != nil { panic(err) |