Merge changes Id390c6c5,Iaa00d4d3,Iba6f410c into main
* changes:
Add third_party/google_benchmark to cronet's copybara
Move buildtools/third_party/libc++[abi] to third_party in Cronet's copybara
Cronet Import: Add jni_zero to the list of third_parties
diff --git a/Cronet/tools/import/copy.bara.sky b/Cronet/tools/import/copy.bara.sky
index 5372a4d..5ae4a6b 100644
--- a/Cronet/tools/import/copy.bara.sky
+++ b/Cronet/tools/import/copy.bara.sky
@@ -71,6 +71,8 @@
"base/third_party/nspr/**",
"base/third_party/superfasthash/**",
"base/third_party/valgrind/**",
+ # Those are temporarily needed until Chromium finish the migration
+ # of libc++[abi]
"buildtools/third_party/libc++/**",
"buildtools/third_party/libc++abi/**",
# Note: Only used for tests.
@@ -85,8 +87,12 @@
# Note: Only used for tests.
"third_party/ced/**",
# Note: Only used for tests.
+ "third_party/google_benchmark/**",
+ # Note: Only used for tests.
"third_party/googletest/**",
"third_party/icu/**",
+ "third_party/libc++/**",
+ "third_party/libc++abi/**",
"third_party/libevent/**",
# Note: Only used for tests.
"third_party/libxml/**",
@@ -95,6 +101,7 @@
"third_party/metrics_proto/**",
"third_party/modp_b64/**",
"third_party/protobuf/**",
+ "third_party/jni_zero/**",
# Note: Only used for tests.
"third_party/quic_trace/**",
# Note: Cronet currently uses Android's zlib