LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge changes I833bff2a,I87c60690

Browse Source 
* changes:
  cronet import: set -e -x in cronet_import.sh
  cronet import: set gclient --delete_unversioned_trees
This commit is contained in:
Patrick Rohr
2023-03-24 15:58:48 +00:00
committed by Gerrit Code Review
parent 465805c6a8 38e3cd8ee9
commit 37f9b2888c
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Cronet/tools/import/import_cronet.sh
View File

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