commit 93dc21fea53263ecce68db2e88bb9186c42600f7
author John Cater <jcater@google.com> Mon Jul 10 09:07:21 2017 +0200
committer László Csomor <laszlocsomor@google.com> Mon Jul 10 09:18:16 2017 +0200
tree 76da9e6d79202fb528ca497dd41a808cd3bddd41
parent dc24004873c33568e10a572f8b8b2c667854520a

Fix #3326 by making sure only one zipper is selected.

Change-Id: Ib061c85900e577f3548d47e8fa86086dfec9654a
PiperOrigin-RevId: 161360338

tools/android/zip_manifest_creator.sh

diff --git a/tools/android/zip_manifest_creator.sh b/tools/android/zip_manifest_creator.sh
index a9beaef..d28b261 100755
--- a/tools/android/zip_manifest_creator.sh
+++ b/tools/android/zip_manifest_creator.sh
@@ -42,7 +42,7 @@
 if "$IS_WINDOWS"; then
   ZIPPER="$(rlocation "[^/]*/tools/zip/zipper/zipper.exe")"
 else
-  ZIPPER="$(find "$RUNFILES" -path "*/tools/zip/zipper/zipper")"
+  ZIPPER="$(find "$RUNFILES" -path "*/tools/zip/zipper/zipper" | head -1)"
 fi
 if [ ! -x "$ZIPPER" ]; then
   # For //tools/android:zip_manifest_creator_test, zipper is here:
@@ -51,7 +51,7 @@
   if "$IS_WINDOWS"; then
     ZIPPER="$(rlocation "[^/]*/third_party/ijar/zipper.exe")"
   else
-    ZIPPER="$(find "${RUNFILES}" -path "*/third_party/ijar/zipper")"
+    ZIPPER="$(find "${RUNFILES}" -path "*/third_party/ijar/zipper" | head -1)"
   fi
 fi
 if [ ! -x "$ZIPPER" ]; then
@@ -63,7 +63,7 @@
   if "$IS_WINDOWS"; then
     echo >&2 "  grep=($(grep zipper "$RUNFILES_MANIFEST_FILE"))"
   else
-    echo >&2 "  find=($(find "$RUNFILES" -name "zipper"))"
+    echo >&2 "  find=($(find "$RUNFILES" -name "zipper" | head -1))"
   fi
   exit 1
 fi