Merge "Delete some unused functions." (eb5fc70c) · Commits · e / os / android_build_soong

cc/util.go

+0 −27

Original line number	Diff line number	Diff line
		@@ -15,9 +15,7 @@
		package cc

		import (
		"fmt"
		"path/filepath"
		"regexp"
		"strings"

		"android/soong/android"
		@@ -30,30 +28,12 @@ func includeDirsToFlags(dirs android.Paths) string {
		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 inList = android.InList
		var filterList = android.FilterList
		var removeListFromList = android.RemoveListFromList
		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 {
		return builderFlags{
		globalCommonFlags: strings.Join(in.Global.CommonFlags, " "),
		@@ -113,13 +93,6 @@ func addPrefix(list []string, prefix string) []string {
		return list
		}

		func addSuffix(list []string, suffix string) []string {
		for i := range list {
		list[i] = list[i] + suffix
		}
		return list
		}

		// linkDirOnDevice/linkName -> target
		func makeSymlinkCmd(linkDirOnDevice string, linkName string, target string) string {
		dir := filepath.Join("$(PRODUCT_OUT)", linkDirOnDevice)