Merge "add support for escaping for zip2zip" (75ebf1ba) · Commits · e / os / android_build_soong

cmd/zip2zip/zip2zip.go

+0 −6

Original line number	Diff line number	Diff line
		@@ -128,12 +128,6 @@ func zip2zip(reader zip.Reader, writer zip.Writer, sortOutput, sortJava, setTi
		}

		for _, arg := range args {
		// Reserve escaping for future implementation, so make sure no
		// one is using \ and expecting a certain behavior.
		if strings.Contains(arg, "\\") {
		return fmt.Errorf("\\ characters are not currently supported")
		}

		input, output := includeSplit(arg)

		var includeMatches []pair

+7 −7

Original line number	Diff line number	Diff line
		@@ -38,13 +38,6 @@ var testCases = []struct {
		storedFiles []string
		err error
		}{
		{
		name: "unsupported \\",

		args: []string{"a\\b:b"},

		err: fmt.Errorf("\\ characters are not currently supported"),
		},
		{ // This is modelled after the update package build rules in build/make/core/Makefile
		name: "filter globs",

		@@ -406,6 +399,13 @@ var testCases = []struct {
		"b/a/b",
		},
		},
		{
		name: "escaping",

		inputFiles: []string{"a"},
		args: []string{"\\a"},
		outputFiles: []string{"a"},
		},
		}

		func errorString(e error) string {