summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2019-02-01 01:44:40 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2019-02-01 01:44:40 +0000
commit267eb6a5ca703f3a8f4fb36d480e070ccd75921c (patch)
tree63bad4c873ff03491fce813e9caa0ed6bda90c7e
parent9b596c0a1e0c26cb0b0bf180f12a830c9c870458 (diff)
parentfc52ffc8f093c67368f82f2826c4fc2171846bc3 (diff)
Merge "Remove '-f' from unzip command"
-rwxr-xr-xtest/etc/run-test-jar4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/etc/run-test-jar b/test/etc/run-test-jar
index 8407b499f4..660c971ae5 100755
--- a/test/etc/run-test-jar
+++ b/test/etc/run-test-jar
@@ -761,8 +761,8 @@ if [ "$USE_ZIPAPEX" = "y" ]; then
if [ "$DEV_MODE" = "y" ]; then
zip_options=""
fi
- setupapex_cmdline="unzip -o -f -u ${zip_options} ${ZIPAPEX_LOC} apex_payload.zip -d ${DEX_LOCATION}"
- installapex_cmdline="unzip -o -f -u ${zip_options} ${DEX_LOCATION}/apex_payload.zip -d ${DEX_LOCATION}/zipapex"
+ setupapex_cmdline="unzip -o -u ${zip_options} ${ZIPAPEX_LOC} apex_payload.zip -d ${DEX_LOCATION}"
+ installapex_cmdline="unzip -o -u ${zip_options} ${DEX_LOCATION}/apex_payload.zip -d ${DEX_LOCATION}/zipapex"
BIN_DIR=$DEX_LOCATION/zipapex/bin
fi