-l option soong_zip can accept a file having space separated list
-l option of soong_zip is used to specify the list of input files that
should be zipped. However, it only accepted newline-separated list in the
file. This prevented us from using a rspfile as paths in rspfile are
space-separated in a single line. Fixing the problem by splitting the
file content by any unicode whitespace character including newline and
space.
Test: zip_test
Change-Id: Iba572109e30c01540eacf20bd2794ba60c870fa3
diff --git a/zip/zip_test.go b/zip/zip_test.go
index 84317d1..9705d6c 100644
--- a/zip/zip_test.go
+++ b/zip/zip_test.go
@@ -46,7 +46,8 @@
"dangling -> missing": nil,
"a/a/d -> b": nil,
"c": fileC,
- "l": []byte("a/a/a\na/a/b\nc\n"),
+ "l_nl": []byte("a/a/a\na/a/b\nc\n"),
+ "l_sp": []byte("a/a/a a/a/b c"),
"l2": []byte("missing\n"),
"manifest.txt": fileCustomManifest,
})
@@ -224,7 +225,19 @@
{
name: "list",
args: fileArgsBuilder().
- List("l"),
+ List("l_nl"),
+ compressionLevel: 9,
+
+ files: []zip.FileHeader{
+ fh("a/a/a", fileA, zip.Deflate),
+ fh("a/a/b", fileB, zip.Deflate),
+ fh("c", fileC, zip.Deflate),
+ },
+ },
+ {
+ name: "list",
+ args: fileArgsBuilder().
+ List("l_sp"),
compressionLevel: 9,
files: []zip.FileHeader{