Merge branch 'main' into do_everything_plus_barrier

Author: bdero

.gitignore

@@ -129,11 +129,16 @@ app.*.symbols
 # Prebuilt binaries.
 /prebuilts/
 
+# TODO(67373): This entry is temporarily disabled, but can be restored once the
+# buildmoot is completed.
 # GN build support for protobufs vended by Fuchsia.
-/build/secondary/third_party/protobuf
+# /build/secondary/third_party/protobuf
 
 # RBE support configurations and scripts vended from CIPD
 /build/rbe
 
 # The test-scripts from Chromium and managed by DEPS and gclient.
 /tools/fuchsia/test_scripts
+
+# The gn-sdk from Chromium and managed by DEPS and gclient.
+/tools/fuchsia/gn-sdk

DEPS

@@ -14,7 +14,7 @@ vars = {
   'flutter_git': 'https://flutter.googlesource.com',
   'skia_git': 'https://skia.googlesource.com',
   'llvm_git': 'https://llvm.googlesource.com',
-  'skia_revision': 'ba3ed5998af356f0fb7c285b4c3d7c0f1b1c1ad1',
+  'skia_revision': '636e136b0da9ccb4d7bad34cec84db4801b9a94a',
 
   # WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
   # See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.
@@ -62,7 +62,7 @@ vars = {
   # Dart is: https://github.com/dart-lang/sdk/blob/main/DEPS
   # You can use //tools/dart/create_updated_flutter_deps.py to produce
   # updated revision list of existing dependencies.
-  'dart_revision': '2876f5684ceddf924aa0e2ab7d34a6baf4717496',
+  'dart_revision': 'be6be2b9ba6e7352edc509cd8358caad6c199ee5',
 
   # WARNING: DO NOT EDIT MANUALLY
   # The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
@@ -254,6 +254,10 @@ vars = {
   # will be used altogether with fuchsia-sdk to setup the build / test
   # environment.
   'fuchsia_test_scripts_version': 'vf8imeAzGv_gjYQDoqub2laI-6nkB3gQNiGuVaFForMC',
+
+  # The version / instance id of the cipd:chromium/fuchsia/gn-sdk which will be
+  # used altogether with fuchsia-sdk to generate gn based build rules.
+  'fuchsia_gn_sdk_version': 'l8zShEOXGGjtLYRulEX5CjT2RemKvUPOT6L-uXy41tMC',
 }
 
 gclient_gn_args_file = 'src/third_party/dart/build/config/gclient_args.gni'
@@ -275,7 +279,7 @@ allowed_hosts = [
 ]
 
 deps = {
-  'src': 'https://github.com/flutter/buildroot.git' + '@' + '5413806166ee3b5198b9dd1c1f684d266ad9850c',
+  'src': 'https://github.com/flutter/buildroot.git' + '@' + '21b1b9f2645fada701885108e86aefbcb3b1cca0',
 
   'src/flutter/third_party/depot_tools':
   Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + '580b4ff3f5cd0dcaa2eacda28cefe0f45320e8f7',
@@ -328,11 +332,13 @@ deps = {
   'src/third_party/perfetto':
    Var('flutter_git') + "/third_party/perfetto" + '@' + Var('dart_perfetto_rev'),
 
-  'src/third_party/protobuf':
+  'src/flutter/third_party/protobuf':
    Var('flutter_git') + '/third_party/protobuf' + '@' + Var('dart_libprotobuf_rev'),
 
-  'src/flutter/build/secondary/third_party/protobuf':
-   Var('flutter_git') + '/third_party/protobuf-gn' + '@' + Var('dart_protobuf_gn_rev'),
+  # TODO(67373): These are temporarily checked in, but this dep can be restored
+  # once the buildmoot is completed.
+  # 'src/flutter/build/secondary/third_party/protobuf':
+  #  Var('flutter_git') + '/third_party/protobuf-gn' + '@' + Var('dart_protobuf_gn_rev'),
 
   'src/third_party/dart':
    Var('dart_git') + '/sdk.git' + '@' + Var('dart_revision'),
@@ -1018,6 +1024,16 @@ deps = {
      'dep_type': 'cipd',
    },
 
+  'src/flutter/tools/fuchsia/gn-sdk': {
+     'packages': [
+       {
+        'package': 'chromium/fuchsia/gn-sdk',
+        'version': Var('fuchsia_gn_sdk_version'),
+       }
+     ],
+     'dep_type': 'cipd',
+   },
+
   'src/third_party/impeller-cmake-example': {
      'url': Var('flutter_git') + '/third_party/impeller-cmake-example.git' + '@' + 'c44e8093972c969acf171be72591e408a85fdc53',
      'condition': 'download_impeller_cmake_example',

tools/fuchsia/gn-sdk/config/config.gni renamed to build/config/fuchsia/gn_configs.gni

@@ -53,3 +53,14 @@ if (fuchsia_sdk_id == "") {
   _meta = read_file(fuchsia_sdk_manifest_file, "json")
   fuchsia_sdk_id = _meta.id
 }
+
+declare_args() {
+  # Specify a readelf_exec path to use. If not specified, the host's system
+  # executable will be used. Passed to populate_build_id_dir.py and
+  # prepare_package_inputs.py via the --readelf-exec flag.
+  # Must be a GN path (not an absolute path) since it is adjusted with
+  # rebase_path().
+  if (!defined(fuchsia_sdk_readelf_exec)) {
+    fuchsia_sdk_readelf_exec = ""
+  }
+}

build/secondary/third_party/protobuf/AUTHORS

@@ -0,0 +1,8 @@
+# This is the list of Fuchsia Authors.
+
+# Names should be added to this file as one of
+#     Organization's name
+#     Individual's name <submission email address>
+#     Individual's name <submission email address> <email2> <emailN>
+
+Google LLC.