Merge "Fix removing partial zip file on error" am: eb32d6c2a6

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1638102

Change-Id: Ie6f3f77ed93cc795dc3bc6d65327682b3513fecd

zip/zip.go

@@ -406,6 +406,8 @@ func Zip(args ZipArgs) error {
 	buf := &bytes.Buffer{}
 	var out io.Writer = buf
 
+	var zipErr error
+
 	if !args.WriteIfChanged {
 		f, err := os.Create(args.OutputFilePath)
 		if err != nil {
@@ -414,7 +416,7 @@ func Zip(args ZipArgs) error {
 
 		defer f.Close()
 		defer func() {
-			if err != nil {
+			if zipErr != nil {
 				os.Remove(args.OutputFilePath)
 			}
 		}()
@@ -422,9 +424,9 @@ func Zip(args ZipArgs) error {
 		out = f
 	}
 
-	err := zipTo(args, out)
-	if err != nil {
-		return err
+	zipErr = zipTo(args, out)
+	if zipErr != nil {
+		return zipErr
 	}
 
 	if args.WriteIfChanged {