From 3c9ad2dc2016c1e1d792c07194f7e6aa92184797 Mon Sep 17 00:00:00 2001
From: philwo <philwo@google.com>
Date: Wed, 25 Nov 2020 08:48:48 -0800
Subject: [PATCH] Separate ijar sources from deployment zip. (#12556)

This is a github only patch from PR #12546. Needs to go in first.

PiperOrigin-RevId: 344260438
---
 third_party/ijar/BUILD | 31 +++++++++++++++++++++++++++----
 1 file changed, 27 insertions(+), 4 deletions(-)

diff --git a/third_party/ijar/BUILD b/third_party/ijar/BUILD
index 3c4a99371ae0a8..e55bf5f1aa2148 100644
--- a/third_party/ijar/BUILD
+++ b/third_party/ijar/BUILD
@@ -124,6 +124,20 @@ filegroup(
 
 genrule(
     name = "ijar_transitive_zip",
+    srcs = [
+        ":ijar_srcs_zip",
+        ":ijar_deploy_zip",
+        "//src:zlib_zip",
+        "//src/main/cpp/util:cpp_util_with_deps_zip",
+    ],
+    outs = ["ijar_with_deps.zip"],
+    cmd = "$(location //src:merge_zip_files) - $@ $(SRCS)",
+    tools = ["//src:merge_zip_files"],
+    visibility = ["//visibility:public"],
+)
+
+genrule(
+    name = "ijar_transitive_srcs_zip",
     srcs = [
         ":ijar_srcs_zip",
         "//src:zlib_zip",
@@ -135,15 +149,24 @@ genrule(
     visibility = ["//visibility:public"],
 )
 
+genrule(
+    name = "ijar_deploy_zip",
+    srcs = [
+        ":ijar",
+        ":zipper",
+    ],
+    outs = ["ijar_deploy.zip"],
+    cmd = "$(location //src:zip_files) ijar $@ $(SRCS)",
+    tools = ["//src:zip_files"],
+    visibility = ["//visibility:public"],
+)
+
 genrule(
     name = "ijar_srcs_zip",
     srcs = glob(
         ["**"],
         exclude = ["BUILD"],
-    ) + [
-        ":ijar",
-        ":zipper",
-    ],
+    ),
     outs = ["ijar_srcs.zip"],
     cmd = "$(location //src:zip_files) ijar $@ $(SRCS)",
     tools = ["//src:zip_files"],