From e499100bb2572f5bab6a1690fb70d69bca2b53b4 Mon Sep 17 00:00:00 2001
From: Dan Field <dnfield@google.com>
Date: Thu, 1 Jul 2021 12:27:42 -0700
Subject: [PATCH] Remove unnecessary experiment flag (#27072)

* Remove unnecessary experiment flag

* add explicit --no-sound-null-safety
---
 lib/snapshot/BUILD.gn                              |  2 --
 lib/web_ui/dev/test_runner.dart                    |  1 -
 shell/platform/fuchsia/dart_runner/kernel/BUILD.gn |  1 -
 shell/platform/fuchsia/flutter/kernel/BUILD.gn     |  1 -
 web_sdk/BUILD.gn                                   | 12 ++++--------
 5 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/lib/snapshot/BUILD.gn b/lib/snapshot/BUILD.gn
index f7c2346c53..7615abf994 100644
--- a/lib/snapshot/BUILD.gn
+++ b/lib/snapshot/BUILD.gn
@@ -46,7 +46,6 @@ compiled_action("generate_snapshot_bin") {
   ]
 
   args = [
-    "--enable-experiment=non-nullable",
     "--snapshot_kind=core",
     "--enable_mirrors=false",
     "--vm_snapshot_data=" + rebase_path(vm_snapshot_data),
@@ -256,7 +255,6 @@ compile_platform("strong_platform") {
   is_runtime_mode_release =
       flutter_runtime_mode == "release" || flutter_runtime_mode == "jit_release"
   args = [
-    "--enable-experiment=non-nullable",
     "--nnbd-agnostic",
     "--target=flutter",
     "-Ddart.vm.product=$is_runtime_mode_release",
diff --git a/lib/web_ui/dev/test_runner.dart b/lib/web_ui/dev/test_runner.dart
index ee76a38f5b..c2300fb1c7 100644
--- a/lib/web_ui/dev/test_runner.dart
+++ b/lib/web_ui/dev/test_runner.dart
@@ -654,7 +654,6 @@ class TestCommand extends Command<bool> with ArgUtils {
       '--no-minify',
       '--disable-inlining',
       '--enable-asserts',
-      '--enable-experiment=non-nullable',
       '--no-sound-null-safety',
 
       // We do not want to auto-select a renderer in tests. As of today, tests
diff --git a/shell/platform/fuchsia/dart_runner/kernel/BUILD.gn b/shell/platform/fuchsia/dart_runner/kernel/BUILD.gn
index 64e6166326..d831ccd47b 100644
--- a/shell/platform/fuchsia/dart_runner/kernel/BUILD.gn
+++ b/shell/platform/fuchsia/dart_runner/kernel/BUILD.gn
@@ -20,7 +20,6 @@ compile_platform("kernel_platform_files") {
   ]
 
   args = [
-    "--enable-experiment=non-nullable",
     "--nnbd-agnostic",
     "--target=dart_runner",
     "dart:core",
diff --git a/shell/platform/fuchsia/flutter/kernel/BUILD.gn b/shell/platform/fuchsia/flutter/kernel/BUILD.gn
index b314388803..470f07964d 100644
--- a/shell/platform/fuchsia/flutter/kernel/BUILD.gn
+++ b/shell/platform/fuchsia/flutter/kernel/BUILD.gn
@@ -20,7 +20,6 @@ compile_platform("kernel_platform_files") {
   ]
 
   args = [
-    "--enable-experiment=non-nullable",
     "--nnbd-agnostic",
     "--target=flutter_runner",
     "dart:core",
diff --git a/web_sdk/BUILD.gn b/web_sdk/BUILD.gn
index dd83ab99bc..4586c510bd 100644
--- a/web_sdk/BUILD.gn
+++ b/web_sdk/BUILD.gn
@@ -116,7 +116,7 @@ prebuilt_dart_action("flutter_dartdevc_kernel_sdk_outline") {
   script = "//third_party/dart/utils/bazel/kernel_worker.dart"
 
   args = [
-    "--enable-experiment=non-nullable",
+    "--no-sound-null-safety",
     "--summary-only",
     "--target",
     "ddc",
@@ -162,7 +162,7 @@ prebuilt_dart_action("flutter_dartdevc_kernel_sdk") {
   ]
 
   args = [
-    "--enable-experiment=non-nullable",
+    "--no-sound-null-safety",
     "--compile-sdk",
     "dart:core",
 
@@ -215,7 +215,7 @@ prebuilt_dart_action("flutter_dartdevc_canvaskit_kernel_sdk") {
   ]
 
   args = [
-    "--enable-experiment=non-nullable",
+    "--no-sound-null-safety",
     "--compile-sdk",
     "dart:core",
 
@@ -270,7 +270,7 @@ prebuilt_dart_action("flutter_dartdevc_canvaskit_html_kernel_sdk") {
   ]
 
   args = [
-    "--enable-experiment=non-nullable",
+    "--no-sound-null-safety",
     "--compile-sdk",
     "dart:core",
 
@@ -325,7 +325,6 @@ prebuilt_dart_action("flutter_dartdevc_kernel_sdk_sound") {
   ]
 
   args = [
-    "--enable-experiment=non-nullable",
     "--sound-null-safety",
     "--compile-sdk",
     "dart:core",
@@ -380,7 +379,6 @@ prebuilt_dart_action("flutter_dartdevc_canvaskit_kernel_sdk_sound") {
   ]
 
   args = [
-    "--enable-experiment=non-nullable",
     "--sound-null-safety",
     "--compile-sdk",
     "dart:core",
@@ -436,7 +434,6 @@ prebuilt_dart_action("flutter_dartdevc_canvaskit_html_kernel_sdk_sound") {
   ]
 
   args = [
-    "--enable-experiment=non-nullable",
     "--sound-null-safety",
     "--compile-sdk",
     "dart:core",
@@ -487,7 +484,6 @@ prebuilt_dart_action("flutter_dartdevc_kernel_sdk_outline_sound") {
   script = "//third_party/dart/utils/bazel/kernel_worker.dart"
 
   args = [
-    "--enable-experiment=non-nullable",
     "--sound-null-safety",
     "--summary-only",
     "--target",
-- 
GitLab