From ac27627dd760aebb5d150c1ecf37df930f37bb6f Mon Sep 17 00:00:00 2001 From: asiva Date: Tue, 28 Jan 2020 19:33:00 +0000 Subject: [PATCH] Do not opt-in to NNBD when building application snapshots for kernel service and other tools like dartjs, dart analyzer etc. We should enable this only when all the tools are ready to opt-in. Change-Id: If7f507d101d006a9e103118c9f989dc9f1b145d0 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/133481 Reviewed-by: Liam Appelbe Commit-Queue: Siva Annamalai --- utils/application_snapshot.gni | 7 ------- utils/kernel-service/BUILD.gn | 3 --- 2 files changed, 10 deletions(-) diff --git a/utils/application_snapshot.gni b/utils/application_snapshot.gni index dd990c86a0f..92c1921f931 100644 --- a/utils/application_snapshot.gni +++ b/utils/application_snapshot.gni @@ -115,9 +115,6 @@ template("_application_snapshot") { "--no-link-platform", "--output=" + rebase_path(output), ] - if (use_nnbd) { - args += [ "--enable-experiment=non-nullable" ] - } if (dart_platform_bytecode) { args += [ "--gen-bytecode", @@ -150,10 +147,6 @@ template("_application_snapshot") { "--snapshot-depfile=$abs_depfile", ] + snapshot_vm_args - if (use_nnbd) { - vm_args += [ "--enable-experiment=non-nullable" ] - } - if (dart_snapshot_kind == "kernel") { vm_args += [ "--snapshot-kind=kernel" ] assert(training_args != "", "Ignoring unused argument") diff --git a/utils/kernel-service/BUILD.gn b/utils/kernel-service/BUILD.gn index e25fb852026..fd637490ba6 100644 --- a/utils/kernel-service/BUILD.gn +++ b/utils/kernel-service/BUILD.gn @@ -115,9 +115,6 @@ template("kernel_service_dill") { "--no-embed-sources", "--output=" + rebase_path(output), ] - if (use_nnbd) { - args += [ "--enable-experiment=non-nullable" ] - } args += [ scheme + ":///pkg/vm/bin/kernel_service.dart" ] if (dart_platform_bytecode) { args += [