--sound-null-safety instead of enable-experiment where possible (flutter#26999)

dnfield · web-flow · commit 3283cafe1738 · 2021-06-29T15:36:03.000-07:00
diff --git a/lib/snapshot/BUILD.gn b/lib/snapshot/BUILD.gn
@@ -46,7 +46,7 @@ compiled_action("generate_snapshot_bin") {
   ]
 
   args = [
-    "--enable-experiment=non-nullable",
+    "--sound-null-safety",
     "--snapshot_kind=core",
     "--enable_mirrors=false",
     "--vm_snapshot_data=" + rebase_path(vm_snapshot_data),
diff --git a/testing/run_tests.py b/testing/run_tests.py
@@ -233,8 +233,7 @@ def SnapshotTest(build_dir, test_packages, dart_file, kernel_file_output, verbos
     dart,
     '--disable-dart-dev',
     frontend_server,
-    '--enable-experiment=non-nullable',
-    '--no-sound-null-safety',
+    '--sound-null-safety',
     '--sdk-root',
     flutter_patched_sdk,
     '--incremental',
diff --git a/testing/testing.gni b/testing/testing.gni
@@ -80,7 +80,7 @@ template("dart_snapshot_kernel") {
       rebase_path("$root_out_dir/flutter_patched_sdk"),
       "--target",
       "flutter",
-      "--enable-experiment=non-nullable",
+      "--sound-null-safety",
       "--output-dill",
       rebase_path(invoker.dart_kernel, root_out_dir),
       "--depfile",
diff --git 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",
+    "--sound-null-safety",
     "--summary-only",
     "--target",
     "ddc",
@@ -162,7 +162,7 @@ prebuilt_dart_action("flutter_dartdevc_kernel_sdk") {
   ]
 
   args = [
-    "--enable-experiment=non-nullable",
+    "--sound-null-safety",
     "--compile-sdk",
     "dart:core",
 
@@ -215,7 +215,7 @@ prebuilt_dart_action("flutter_dartdevc_canvaskit_kernel_sdk") {
   ]
 
   args = [
-    "--enable-experiment=non-nullable",
+    "--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",
+    "--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",

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ compiled_action("generate_snapshot_bin") {`
`46`	`46`	`]`
`47`	`47`
`48`	`48`	`args = [`
`49`		`- "--enable-experiment=non-nullable",`
	`49`	`+ "--sound-null-safety",`
`50`	`50`	`"--snapshot_kind=core",`
`51`	`51`	`"--enable_mirrors=false",`
`52`	`52`	`"--vm_snapshot_data=" + rebase_path(vm_snapshot_data),`