diff options
| author | 2018-10-02 11:14:36 -0700 | |
|---|---|---|
| committer | 2018-10-02 11:16:56 -0700 | |
| commit | 06080f413742cc9044e2c1ffa655bee25b1f6dd3 (patch) | |
| tree | abe1b7f7abd12c6d06de0dd9431c711e58c32b84 | |
| parent | 16d387c970421be7060d74ac1957f6047478afaf (diff) | |
Fix double space in include argument
The double space is confusing compdb.go. compdb.go should be fixed,
but the double space is unnecessary so remove it.
Also make -isystem consistently followed by a space.
Bug: 117124308
Test: m checkbuild
Change-Id: I5ce7530d2ef66be8d8285e252d60a39299984a06
| -rw-r--r-- | cc/kernel_headers.go | 2 | ||||
| -rw-r--r-- | cc/llndk_library.go | 6 | ||||
| -rw-r--r-- | cc/ndk_prebuilt.go | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/cc/kernel_headers.go b/cc/kernel_headers.go index 42dc7701c..82a779c33 100644 --- a/cc/kernel_headers.go +++ b/cc/kernel_headers.go @@ -26,7 +26,7 @@ func (stub *kernelHeadersDecorator) link(ctx ModuleContext, flags Flags, deps Pa if ctx.Device() { f := &stub.libraryDecorator.flagExporter for _, dir := range ctx.DeviceConfig().DeviceKernelHeaderDirs() { - f.flags = append(f.flags, "-isystem"+dir) + f.flags = append(f.flags, "-isystem "+dir) } } return stub.libraryDecorator.linkStatic(ctx, flags, deps, objs) diff --git a/cc/llndk_library.go b/cc/llndk_library.go index c23dfd413..32da05946 100644 --- a/cc/llndk_library.go +++ b/cc/llndk_library.go @@ -144,17 +144,17 @@ func (stub *llndkStubDecorator) link(ctx ModuleContext, flags Flags, deps PathDe timestampFiles = append(timestampFiles, stub.processHeaders(ctx, dir, genHeaderOutDir)) } - includePrefix := "-I " + includePrefix := "-I" if Bool(stub.Properties.Export_headers_as_system) { includePrefix = "-isystem " } - stub.reexportFlags([]string{includePrefix + " " + genHeaderOutDir.String()}) + stub.reexportFlags([]string{includePrefix + genHeaderOutDir.String()}) stub.reexportDeps(timestampFiles) } if Bool(stub.Properties.Export_headers_as_system) { - stub.exportIncludes(ctx, "-isystem") + stub.exportIncludes(ctx, "-isystem ") stub.libraryDecorator.flagExporter.Properties.Export_include_dirs = []string{} } diff --git a/cc/ndk_prebuilt.go b/cc/ndk_prebuilt.go index 258d6bd97..2a7e6573a 100644 --- a/cc/ndk_prebuilt.go +++ b/cc/ndk_prebuilt.go @@ -137,7 +137,7 @@ func (ndk *ndkPrebuiltStlLinker) link(ctx ModuleContext, flags Flags, ctx.ModuleErrorf("NDK prebuilt libraries must have an ndk_lib prefixed name") } - ndk.exportIncludes(ctx, "-isystem") + ndk.exportIncludes(ctx, "-isystem ") libName := strings.TrimPrefix(ctx.ModuleName(), "ndk_") libExt := flags.Toolchain.ShlibSuffix() |