commit 37f9b2888c08c32069f93ad3c869e39e453c3280
author Patrick Rohr <prohr@google.com> Fri Mar 24 15:58:48 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Mar 24 15:58:48 2023 +0000
tree be7b736d2dc4537d07b9cf8ed4e56aaeedb6b49b
parent 465805c6a8922239c7bc54fc70277884a988c0bc
parent 38e3cd8ee974336d9a6077e6db6f6c3c3327427d

Merge changes I833bff2a,I87c60690

* changes:
  cronet import: set -e -x in cronet_import.sh
  cronet import: set gclient --delete_unversioned_trees

Cronet/tools/import/import_cronet.sh

diff --git a/Cronet/tools/import/import_cronet.sh b/Cronet/tools/import/import_cronet.sh
index 6639a4c..0f04af7 100755
--- a/Cronet/tools/import/import_cronet.sh
+++ b/Cronet/tools/import/import_cronet.sh
@@ -24,6 +24,8 @@
 #   -n rev: The new revision to import.
 #   -f: Force copybara to ignore a failure to find the last imported revision.
 
+set -e -x
+
 OPTSTRING=fl:n:
 
 usage() {
@@ -55,7 +57,7 @@
 # Arguments:
 #   new_rev, string
 #######################################
-setup_folder_origin() {
+setup_folder_origin() (
     local _new_rev=$1
     mkdir -p "${COPYBARA_FOLDER_ORIGIN}"
     cd "${COPYBARA_FOLDER_ORIGIN}"
@@ -83,9 +85,10 @@
     cd src
     # Set appropriate gclient flags to speed up syncing.
     gclient sync \
-        --no-history
-        --shallow
-}
+        --no-history \
+        --shallow \
+        --delete_unversioned_trees
+)
 
 #######################################
 # Runs the copybara import of Chromium