cronet import: set gclient --delete_unversioned_trees
This option deletes gclient dependencies that were remove upstream, so
it makes sense to always set this flag for the import (since the import
directoy is reused to speed up the process).
This change also fixes setup_folder_origin to run in a subshell to
contain the directory change it performs.
Test: none
Change-Id: I87c60690be81843c3947acc0251967372ed4c34a
diff --git a/Cronet/tools/import/import_cronet.sh b/Cronet/tools/import/import_cronet.sh
index 6639a4c..994e28a 100755
--- a/Cronet/tools/import/import_cronet.sh
+++ b/Cronet/tools/import/import_cronet.sh
@@ -55,7 +55,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 +83,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