StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Delete some unused functions."

Browse Source
This commit is contained in:
Liz Kammer
2022-04-27 17:36:09 +00:00
committed by Gerrit Code Review
parent 4e70b7586a c2554b6df2
commit eb5fc70c7b
1 changed files with 0 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
cc/util.go
View File

@@ -15,9 +15,7 @@
package cc package cc
import ( import (
"fmt"
"path/filepath" "path/filepath"
"regexp"
"strings" "strings"
"android/soong/android" "android/soong/android"
@@ -30,30 +28,12 @@ func includeDirsToFlags(dirs android.Paths) string {
return android.JoinWithPrefix(dirs.Strings(), "-I") return android.JoinWithPrefix(dirs.Strings(), "-I")
} }
func ldDirsToFlags(dirs []string) string {
return android.JoinWithPrefix(dirs, "-L")
}
func libNamesToFlags(names []string) string {
return android.JoinWithPrefix(names, "-l")
}
var indexList = android.IndexList var indexList = android.IndexList
var inList = android.InList var inList = android.InList
var filterList = android.FilterList var filterList = android.FilterList
var removeListFromList = android.RemoveListFromList var removeListFromList = android.RemoveListFromList
var removeFromList = android.RemoveFromList var removeFromList = android.RemoveFromList
var libNameRegexp = regexp.MustCompile(`^lib(.*)$`)
func moduleToLibName(module string) (string, error) {
matches := libNameRegexp.FindStringSubmatch(module)
if matches == nil {
return "", fmt.Errorf("Library module name %s does not start with lib", module)
}
return matches[1], nil
}
func flagsToBuilderFlags(in Flags) builderFlags { func flagsToBuilderFlags(in Flags) builderFlags {
return builderFlags{ return builderFlags{
globalCommonFlags: strings.Join(in.Global.CommonFlags, " "), globalCommonFlags: strings.Join(in.Global.CommonFlags, " "),
@@ -113,13 +93,6 @@ func addPrefix(list []string, prefix string) []string {
return list return list
} }
func addSuffix(list []string, suffix string) []string {
for i := range list {
list[i] = list[i] + suffix
}
return list
}
// linkDirOnDevice/linkName -> target // linkDirOnDevice/linkName -> target
func makeSymlinkCmd(linkDirOnDevice string, linkName string, target string) string { func makeSymlinkCmd(linkDirOnDevice string, linkName string, target string) string {
dir := filepath.Join("$(PRODUCT_OUT)", linkDirOnDevice) dir := filepath.Join("$(PRODUCT_OUT)", linkDirOnDevice)