Commit Graph

24 Commits

Author SHA1 Message Date
Treehugger Robot
655d0850ac Merge "Add third_party/cpu_features to Cronet's copybara" into main 2023-09-12 17:48:34 +00:00
Patrick Rohr
371b709921 Fix sorting in copy.bara.sky
Test: none
Change-Id: I0506ec660fd88e39079b2f36aed1516e27cdc0a6
2023-09-08 07:11:56 -07:00
Mohannad Farrag
1541d9fbd4 Add third_party/cpu_features to Cronet's copybara
See https://android-review.git.corp.google.com/c/platform/external/cronet/+/2719789/2 for more information.
Test: None

Change-Id: I3598857b2af5e09eee01ac3493135ec36b10e9b8
2023-09-08 09:23:25 +00:00
Mohannad Farrag
b16875a4d1 Add third_party/google_benchmark to cronet's copybara
Test: None
Change-Id: Id390c6c53f619b7bc87c80ae08acca9ee3a65c2e
2023-09-08 09:23:25 +00:00
Mohannad Farrag
c4daa59cd7 Move buildtools/third_party/libc++[abi] to third_party in Cronet's copybara
Test: None
Change-Id: Iaa00d4d383f84fbabe346cbe9a929ba471d68297
2023-09-08 09:23:25 +00:00
Mohannad Farrag
eaba52172c Cronet Import: Add jni_zero to the list of third_parties
Test: None
Change-Id: Iba6f410c23bdabbb5559772039b4242965e720a7
2023-09-08 09:23:03 +00:00
Patrick Rohr
38e3cd8ee9 cronet import: set -e -x in cronet_import.sh
To better surface errors in the import script.

Test: run script
Change-Id: I833bff2aebd9a89f2cccfe3b6271db86f1bd6dab
2023-03-24 06:56:22 -07:00
Patrick Rohr
538dd3e875 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
2023-03-24 06:55:49 -07:00
Patrick Rohr
2bbe771ceb cronet import: exclude .gitignore from import
Test: none
Change-Id: I79200198264a54f517a18a3cfbc77030e89f3401
2023-03-21 10:39:17 -07:00
Patrick Rohr
82104369dd cronet import: Remove //components/grpc_support from import
Cronet does not actually depend on grpc_support, so it can be removed.

Test: none
Change-Id: Ib28591bc751774244d3c62298a0d07f2163f6720
2023-03-21 09:11:29 -07:00
Patrick Rohr
e095f9d8d6 cronet import: only clone repository if it doesn't already exist
Otherwise, fetch and checkout the revision.

Test: run import
Change-Id: I11d77e8abfc50fee92f440ad46cb09ab87392e05
2023-03-21 04:45:38 -07:00
Patrick Rohr
447b79d632 cronet import: use aosp/upstream-import branch
upstream-import and upstream-staging have been created in aosp.

Test: none
Change-Id: Id988da4f1cf311f419963e1f20d4e89e92b11aca
2023-03-21 04:45:38 -07:00
Patrick Rohr
b781c8f882 cronet import: remove zlib from import
Test: run import
Change-Id: I51735fdbfee3118ec2529af7158611c25b34e79b
2023-03-21 04:45:38 -07:00
Patrick Rohr
3b452fed22 cronet import: add url/third_party/mozilla
Test: run import -- see also aosp/2498638
Change-Id: I3df00ebf2a6e737d33783c3f7b9e438f33a46822
2023-03-21 04:45:38 -07:00
Patrick Rohr
f5e301093c cronet import: remove unwanted third-party dirs as per aosp/2469560
Test: run import script
Change-Id: Idddb7e2bb68c4faa0e0096c029902be368c8e0d1
2023-03-14 11:32:53 -07:00
Patrick Rohr
8902e90dd3 cronet import: add test dependencies that were imported in aosp/2399270
Test: run script
Change-Id: I403ffbf74d7e986978e1f5a2f1a6fc90c256efe6
2023-03-14 11:03:53 -07:00
Patrick Rohr
fea38c91ea cronet import: use folder.origin instead of git.origin
git.origin uses a bare repo which is not supported by gclient. There may
be ways to get this to work including the git-origin-checkout-hook, but
those are a) really slow and b) much more complex than just using a
folder.origin.

This change also adds support to the import script to configure the
origin folder (i.e. clone the repo and run gclient) before the copybara
script is invoked.

Test: run import script
Change-Id: I6289108271960c87583a059a553b0d0e7db8af68
2023-03-14 11:03:53 -07:00
Patrick Rohr
3cefd0b8d1 cronet import: use public chromium repository as a source
rpc://chromium/chromium/src contains a partial mirror of the Chromium
repo. Unfortunately, the mirror cannot be used as it seems to have been
created with a different gclient config (i.e. target_os is not set to
'android').

Additionally, do not use partial_fetch as gclient requires a full
checkout.

Test: run import script.
Change-Id: Iac185d3af38d95ec394551f3ca1487e65cf6c975
2023-03-10 10:05:18 -08:00
Patrick Rohr
8d63fd68aa cronet import: add --git-origin-checkout-hook to run gclient
Running gclient in Copybara's git origin checkout is a bit tricky.
Copybara does a bare checkout which gclient does not support (and it
keeps the git dir speparate from the checkout dir). This checkout script
essentially reinitializes the git dir and runs a gclient sync on it.

Test: ./import_cronet.sh -n 108.0.5359.128 -l \
1cd27afdb8e5d057070c0961e04c490d2aca1aa0 -f

Change-Id: I2b78a7b8e0e1e9adc74175e90560a58a82b978ca
2023-03-10 10:05:18 -08:00
Patrick Rohr
2ceab19fe7 cronet import: let script create upstream-import branch
git branch will fail if the branch already exists which is exactly what
we want.

Test: run script
Change-Id: I2e05b016d532d52b473d8cb5d99b831f25a39b5f
2023-03-07 11:23:00 -08:00
Patrick Rohr
3817a942a1 cronet import: add flag to set --force
Test: run script
Change-Id: I8ff36f37cd47c54a906038f36f7bc00fbcf7fa0e
2023-03-07 11:22:01 -08:00
Patrick Rohr
6deb3db84c cronet import: make last_rev optional
Copybara should be smart enough to find last_rev from the last commit.

Test: run script.
Change-Id: I302bbe8da24501ede178c0851244a3de940a7706
2023-03-07 11:21:17 -08:00
Patrick Rohr
d57576032a cronet import: remove all OWNERS files
Including MIRACLE_PTR_OWNERS, SECURITY_OWNERS, etc.

Test: none
Change-Id: I0c3437bba7aa0a3dafec1cd5be00cf55d245a5bd
2023-02-28 13:34:37 -08:00
Patrick Rohr
61e83c8a19 cronet: Create bare version of import script
This creates a very basic (and untested!) version of an import script.
Checking this in now, so we can get better history as it evolves.

import_cronet.sh can be used to invoke copybara and set the appropriate
command line arguments.

Test: ./import_cronet.sh -l 108.0.5359.128 -n 110.0.5481.65
Change-Id: I74c6aa9245e102a1f94d0630e41ddd1079e9d41f
2023-02-17 15:23:02 -08:00