aboutsummaryrefslogtreecommitdiffstats
path: root/cmd
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2018-03-15 16:24:10 -0700
committerColin Cross <ccross@android.com>2018-03-20 11:21:42 -0700
commit0a7d85a89609053e604035c27552dcf8cd483f5d (patch)
tree9611d86534fdbfa5d6152a7be19434ac28b438c8 /cmd
parentf2986f067bdac13049a2f0449d77ab1f63b0ef90 (diff)
downloadbuild_soong-0a7d85a89609053e604035c27552dcf8cd483f5d.tar.gz
build_soong-0a7d85a89609053e604035c27552dcf8cd483f5d.tar.bz2
build_soong-0a7d85a89609053e604035c27552dcf8cd483f5d.zip
Replace extract-srcjars.sh with zipsync tool
extract_srcjars.sh uses zipinfo and unzip, which fail with an error on an empty zip file. Instead of trying to hack around this (which is hard to make guarantees for since they are non-hermetic host tools), replace them with a go tool to unzip a set of zip files into a directory. Bug: 73885582 Test: m checkbuild Change-Id: I151fed347ed5196726e36866ffc27bc831799afb Merged-In: I151fed347ed5196726e36866ffc27bc831799afb (cherry picked from commit 436b76564d83586c68025985bc5d9fc7774109bf)
Diffstat (limited to 'cmd')
-rw-r--r--cmd/zipsync/Android.bp25
-rw-r--r--cmd/zipsync/zipsync.go124
2 files changed, 149 insertions, 0 deletions
diff --git a/cmd/zipsync/Android.bp b/cmd/zipsync/Android.bp
new file mode 100644
index 00000000..22feadc8
--- /dev/null
+++ b/cmd/zipsync/Android.bp
@@ -0,0 +1,25 @@
+// Copyright 2016 Google Inc. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+blueprint_go_binary {
+ name: "zipsync",
+ deps: [
+ "android-archive-zip",
+ "blueprint-pathtools",
+ ],
+ srcs: [
+ "zipsync.go",
+ ],
+}
+
diff --git a/cmd/zipsync/zipsync.go b/cmd/zipsync/zipsync.go
new file mode 100644
index 00000000..035a1455
--- /dev/null
+++ b/cmd/zipsync/zipsync.go
@@ -0,0 +1,124 @@
+// Copyright 2018 Google Inc. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+ "archive/zip"
+ "flag"
+ "fmt"
+ "io"
+ "io/ioutil"
+ "log"
+ "os"
+ "path/filepath"
+ "strings"
+)
+
+var (
+ outputDir = flag.String("d", "", "output dir")
+ outputFile = flag.String("l", "", "output list file")
+ filter = flag.String("f", "", "optional filter pattern")
+)
+
+func must(err error) {
+ if err != nil {
+ log.Fatal(err)
+ }
+}
+
+func writeFile(filename string, in io.Reader, perm os.FileMode) error {
+ out, err := os.OpenFile(filename, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, perm)
+ if err != nil {
+ return err
+ }
+ _, err = io.Copy(out, in)
+ if err != nil {
+ out.Close()
+ return err
+ }
+
+ return out.Close()
+}
+
+func main() {
+ flag.Usage = func() {
+ fmt.Fprintln(os.Stderr, "usage: zipsync -d <output dir> [-l <output file>] [-f <pattern>] [zip]...")
+ flag.PrintDefaults()
+ }
+
+ flag.Parse()
+
+ if *outputDir == "" {
+ flag.Usage()
+ os.Exit(1)
+ }
+
+ inputs := flag.Args()
+
+ // For now, just wipe the output directory and replace its contents with the zip files
+ // Eventually this could only modify the directory contents as necessary to bring it up
+ // to date with the zip files.
+ must(os.RemoveAll(*outputDir))
+
+ must(os.MkdirAll(*outputDir, 0777))
+
+ var files []string
+ seen := make(map[string]string)
+
+ for _, input := range inputs {
+ reader, err := zip.OpenReader(input)
+ if err != nil {
+ log.Fatal(err)
+ }
+ defer reader.Close()
+
+ for _, f := range reader.File {
+ if *filter != "" {
+ if match, err := filepath.Match(*filter, filepath.Base(f.Name)); err != nil {
+ log.Fatal(err)
+ } else if !match {
+ continue
+ }
+ }
+ if filepath.IsAbs(f.Name) {
+ log.Fatal("%q in %q is an absolute path", f.Name, input)
+ }
+
+ if prev, exists := seen[f.Name]; exists {
+ log.Fatal("%q found in both %q and %q", f.Name, prev, input)
+ }
+ seen[f.Name] = input
+
+ filename := filepath.Join(*outputDir, f.Name)
+ if f.FileInfo().IsDir() {
+ must(os.MkdirAll(filename, f.FileInfo().Mode()))
+ } else {
+ must(os.MkdirAll(filepath.Dir(filename), 0777))
+ in, err := f.Open()
+ if err != nil {
+ log.Fatal(err)
+ }
+ must(writeFile(filename, in, f.FileInfo().Mode()))
+ in.Close()
+ files = append(files, filename)
+ }
+ }
+ }
+
+ if *outputFile != "" {
+ data := strings.Join(files, "\n") + "\n"
+ must(ioutil.WriteFile(*outputFile, []byte(data), 0666))
+ }
+}