diff options
author | Colin Cross <ccross@android.com> | 2015-04-24 15:10:32 -0700 |
---|---|---|
committer | Colin Cross <ccross@android.com> | 2015-04-27 14:32:36 -0700 |
commit | 957cc4e20d6897f641f3c323541c54af065e8531 (patch) | |
tree | cef8d3cdc12201e79aa794fb03396faa2417fda7 /cmd | |
parent | e19c79310daff72a700f4968bd702ac9d40caff7 (diff) | |
download | build_soong-957cc4e20d6897f641f3c323541c54af065e8531.tar.gz build_soong-957cc4e20d6897f641f3c323541c54af065e8531.tar.bz2 build_soong-957cc4e20d6897f641f3c323541c54af065e8531.zip |
soong_jar: ignore directories passed to jar unless -d is set
Java resource lists created by globs like "**/*" may include
directories. Ignore them when creating the zip file unless
-d was passed on the command line. Fixes read: is a directory
errors.
Change-Id: Ifa6fd4fbd8262f700bed1f4a7268f11618dc305c
Diffstat (limited to 'cmd')
-rw-r--r-- | cmd/soong_jar/soong_jar.go | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/cmd/soong_jar/soong_jar.go b/cmd/soong_jar/soong_jar.go index 95c86c3d..4a4a3ab2 100644 --- a/cmd/soong_jar/soong_jar.go +++ b/cmd/soong_jar/soong_jar.go @@ -176,6 +176,13 @@ func (z *zipWriter) writeRelFile(root, file string) error { } func (z *zipWriter) writeFile(rel, file string) error { + if s, _ := os.Stat(file); s.IsDir() { + if z.directories { + return z.writeDirectory(file) + } + return nil + } + if z.directories { dir, _ := filepath.Split(rel) err := z.writeDirectory(dir) |