Merge "Add flag to skip writing output from soong_zip." into main (c38523cd) · Commits · e / os / android_build_soong

zip/cmd/main.go

+2 −0

Original line number	Diff line number	Diff line
		@@ -173,6 +173,7 @@ func main() {
		cpuProfile := flags.String("cpuprofile", "", "write cpu profile to file")
		traceFile := flags.String("trace", "", "write trace to file")
		sha256Checksum := flags.Bool("sha256", false, "add a zip header to each file containing its SHA256 digest")
		doNotWrite := flags.Bool("n", false, "Nothing is written to disk -- all other work happens")

		flags.Var(&rootPrefix{}, "P", "path prefix within the zip at which to place files")
		flags.Var(&listFiles{}, "l", "file containing list of files to zip")
		@@ -236,6 +237,7 @@ func main() {
		StoreSymlinks: *symlinks,
		IgnoreMissingFiles: *ignoreMissingFiles,
		Sha256Checksum: *sha256Checksum,
		DoNotWrite: *doNotWrite,
		})
		if err != nil {
		fmt.Fprintln(os.Stderr, "error:", err.Error())

+5 −2

Original line number	Diff line number	Diff line
		@@ -282,6 +282,7 @@ type ZipArgs struct {
		StoreSymlinks bool
		IgnoreMissingFiles bool
		Sha256Checksum bool
		DoNotWrite bool

		Stderr io.Writer
		Filesystem pathtools.FileSystem
		@@ -400,7 +401,9 @@ func Zip(args ZipArgs) error {

		var zipErr error

		if !args.WriteIfChanged {
		if args.DoNotWrite {
		out = io.Discard
		} else if !args.WriteIfChanged {
		f, err := os.Create(args.OutputFilePath)
		if err != nil {
		return err
		@@ -421,7 +424,7 @@ func Zip(args ZipArgs) error {
		return zipErr
		}

		if args.WriteIfChanged {
		if args.WriteIfChanged && !args.DoNotWrite {
		err := pathtools.WriteFileIfChanged(args.OutputFilePath, buf.Bytes(), 0666)
		if err != nil {
		return err