commit 447b79d632d29d0d40fcdbe2427535977a39bb69
author Patrick Rohr <prohr@google.com> Mon Mar 20 10:21:46 2023 -0700
committer Patrick Rohr <prohr@google.com> Tue Mar 21 04:45:38 2023 -0700
tree b83ff0f1e673c41f5536bb89ad2a1a9634a5875b
parent b781c8f882a1ecb8727d75a092d1c5e4468f7c36

cronet import: use aosp/upstream-import branch

upstream-import and upstream-staging have been created in aosp.

Test: none
Change-Id: Id988da4f1cf311f419963e1f20d4e89e92b11aca

Cronet/tools/import/import_cronet.sh

diff --git a/Cronet/tools/import/import_cronet.sh b/Cronet/tools/import/import_cronet.sh
index d0c8deb..f5545a3 100755
--- a/Cronet/tools/import/import_cronet.sh
+++ b/Cronet/tools/import/import_cronet.sh
@@ -36,7 +36,7 @@
 COPYBARA_FOLDER_ORIGIN="/tmp/copybara-origin"
 
 #######################################
-# Create upstream-import branch in external/cronet.
+# Create local upstream-import branch in external/cronet.
 # Globals:
 #   ANDROID_BUILD_TOP
 # Arguments:
@@ -44,10 +44,8 @@
 #######################################
 setup_upstream_import_branch() {
     local git_dir="${ANDROID_BUILD_TOP}/external/cronet"
-    local initial_empty_repo_sha="d1add53d6e90815f363c91d433735556ce79b0d2"
 
-    # Suppress error message if branch already exists.
-    (cd "${git_dir}" && git branch upstream-import "${initial_empty_repo_sha}") 2>/dev/null
+    (cd "${git_dir}" && git fetch aosp upstream-import:upstream-import)
 }
 
 #######################################