Merge "Fix soong_zip printing warnings with --ignore_missing_files" (dc208bb2) · Commits · e / os / android_build_soong

zip/zip.go

+3 −3

Original line number	Diff line number	Diff line
		@@ -317,7 +317,7 @@ func ZipTo(args ZipArgs, w io.Writer) error {
		Err: os.ErrNotExist,
		}
		if args.IgnoreMissingFiles {
		fmt.Fprintln(args.Stderr, "warning:", err)
		fmt.Fprintln(z.stderr, "warning:", err)
		} else {
		return err
		}
		@@ -334,7 +334,7 @@ func ZipTo(args ZipArgs, w io.Writer) error {
		Err: os.ErrNotExist,
		}
		if args.IgnoreMissingFiles {
		fmt.Fprintln(args.Stderr, "warning:", err)
		fmt.Fprintln(z.stderr, "warning:", err)
		} else {
		return err
		}
		@@ -345,7 +345,7 @@ func ZipTo(args ZipArgs, w io.Writer) error {
		Err: syscall.ENOTDIR,
		}
		if args.IgnoreMissingFiles {
		fmt.Fprintln(args.Stderr, "warning:", err)
		fmt.Fprintln(z.stderr, "warning:", err)
		} else {
		return err
		}