aboutsummaryrefslogtreecommitdiffstats
path: root/cc/util.go
diff options
context:
space:
mode:
authorDan Willemsen <dwillemsen@google.com>2015-09-23 15:26:20 -0700
committerDan Willemsen <dwillemsen@google.com>2015-12-09 14:29:12 -0800
commit34cc69e4bf36cb65bb181b42ccb0f8c792a32cfb (patch)
treeecaff919037e29033fa9b3bbfb33baa8e93196cf /cc/util.go
parentfafa3dc7e267675610a34b0c335be350eb30936d (diff)
downloadbuild_soong-34cc69e4bf36cb65bb181b42ccb0f8c792a32cfb.tar.gz
build_soong-34cc69e4bf36cb65bb181b42ccb0f8c792a32cfb.tar.bz2
build_soong-34cc69e4bf36cb65bb181b42ccb0f8c792a32cfb.zip
Use `Path` instead of string for file paths
This centralizes verification and common operations, like converting the path to a source file to the path for a built object. It also embeds the configuration knowledge into the path, so that we can remove "${SrcDir}/path" from the ninja file. When SrcDir is '.', that leads to paths like './path' instead of just 'path' like make is doing, causing differences in compiled binaries. Change-Id: Ib4e8910a6e867ce1b7b420d927c04f1142a7589e
Diffstat (limited to 'cc/util.go')
-rw-r--r--cc/util.go8
1 files changed, 4 insertions, 4 deletions
diff --git a/cc/util.go b/cc/util.go
index efc89f05..2fc717b7 100644
--- a/cc/util.go
+++ b/cc/util.go
@@ -24,12 +24,12 @@ import (
// Efficiently converts a list of include directories to a single string
// of cflags with -I prepended to each directory.
-func includeDirsToFlags(dirs []string) string {
- return common.JoinWithPrefix(dirs, "-I")
+func includeDirsToFlags(dirs common.Paths) string {
+ return common.JoinWithPrefix(dirs.Strings(), "-I")
}
-func includeFilesToFlags(dirs []string) string {
- return common.JoinWithPrefix(dirs, "-include ")
+func includeFilesToFlags(files common.Paths) string {
+ return common.JoinWithPrefix(files.Strings(), "-include ")
}
func ldDirsToFlags(dirs []string) string {