Flutter release/3.16.3

DEPS

@@ -20,6 +20,11 @@ vars = {
   'ocmock_git': 'https://github.com/erikdoe/ocmock.git',
   'skia_revision': '795ed944ff5bde5916d193824589d3bacfa61a7d',
 
+  'dart_sdk_revision': '072a1dacbcf3522ee8a0e7043436b500c0cbbef9',
+  'dart_sdk_git': '[email protected]:shorebirdtech/dart-sdk.git',
+  'updater_git': 'https://github.com/shorebirdtech/updater.git',
+  'updater_rev': 'd785568094c176d956ccf7ae918bf8d64c0d09b7',
+
   # WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
   # See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.
   'canvaskit_cipd_instance': '61aeJQ9laGfEFF_Vlc_u0MCkqB6xb2hAYHRBxKH-Uw4C',
@@ -262,7 +267,7 @@ allowed_hosts = [
 ]
 
 deps = {
-  'src': 'https://github.com/flutter/buildroot.git' + '@' + 'f27d99b4428dea312646130d60c33a2d38fa9dc6',
+  'src': 'https://github.com/shorebirdtech/buildroot.git' + '@' + '2c3c95dc8cdb71fa176fe2e7886ef2022cbdc3bb',
 
    # Fuchsia compatibility
    #

ci/licenses_golden/licenses_third_party

@@ -61899,4 +61899,8 @@ freely, subject to the following restrictions:
 3. This notice may not be removed or altered from any source distribution.
 ====================================================================================================
 
+<<<<<<< HEAD
 Total license count: 868
+=======
+Total license count: 888
+>>>>>>> shorebird/dev

shell/common/shell.cc

@@ -427,6 +427,16 @@ Shell::Shell(DartVMRef vm,
       volatile_path_tracker_(std::move(volatile_path_tracker)),
       weak_factory_gpu_(nullptr),
       weak_factory_(this) {
+  // FIXME: This is probably the wrong place to hook into.  Currently we only
+  // link the shorebird updater on Android, so if we don't guard this other
+  // non-android targets (e.g. flutter_tester) will fail to link.
+  #if FML_OS_ANDROID || FML_OS_IOS
+    if (!vm) {
+      shorebird_report_launch_failure();
+    } else {
+      shorebird_report_launch_success();
+    }
+  #endif
   FML_CHECK(!settings.enable_software_rendering || !settings.enable_impeller)
       << "Software rendering is incompatible with Impeller.";
   FML_CHECK(vm_) << "Must have access to VM to create a shell.";

shell/platform/android/io/flutter/embedding/engine/FlutterJNI.java

@@ -39,6 +39,7 @@
 import io.flutter.view.AccessibilityBridge;
 import io.flutter.view.FlutterCallbackInformation;
 import io.flutter.view.TextureRegistry;
+import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;

shell/platform/darwin/ios/framework/Source/FlutterDartProject.mm

@@ -26,6 +26,7 @@
 #import "flutter/shell/platform/darwin/ios/framework/Headers/FlutterViewController.h"
 
 FLUTTER_ASSERT_NOT_ARC
+#include "third_party/updater/library/include/updater.h"
 
 extern "C" {
 #if FLUTTER_RUNTIME_MODE == FLUTTER_RUNTIME_MODE_DEBUG