Rename vm_platform_strong.dill to vm_platform.dill.

The name has always been annoying because it did not add strong typing. And now there aren't variants of the VM platform to distinguish.

Leave a copy at the old name to not immediately break illegal uses.

TEST=ci
Cq-Include-Trybots: luci.dart.try:flutter-analyze-try,flutter-frontend-try,flutter-linux-try
Change-Id: Ie76fa7f16940aa1ba8d582eb5197f0ae55dc8938
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/429828
Reviewed-by: Johnni Winther <[email protected]>
Reviewed-by: Nicholas Shahan <[email protected]>
Commit-Queue: Ryan Macnak <[email protected]>

Author: rmacnak-google

benchmarks/SDKArtifactSizes/dart/SDKArtifactSizes.dart

@@ -8,10 +8,7 @@ import 'dart:io';
 
 const executables = <String>['dart', 'dartaotruntime'];
 
-const libs = <String>[
-  'vm_platform_strong.dill',
-  'vm_platform_strong_product.dill',
-];
+const libs = <String>['vm_platform.dill', 'vm_platform_product.dill'];
 
 const snapshots = <String>[
   'analysis_server',

build/gn_dart_compile_exe.py

@@ -90,7 +90,7 @@ def main(argv):
         return 1
 
     platform_dill = os.path.join(prebuilt_sdk, "lib", "_internal",
-                                 "vm_platform_strong.dill")
+                                 "vm_platform.dill")
     if not os.path.isfile(platform_dill):
         print("Binary not found: " + platform_dill)
         return 1

build/rbe/rewrapper_dart.py

@@ -360,8 +360,7 @@ def parse_dart(self):
                 self.extra_paths.add(self.rebase(arg))
                 self.extra_paths.add(
                     self.rebase(
-                        os.path.join(self.dart_subdir,
-                                     'vm_platform_strong.dill')))
+                        os.path.join(self.dart_subdir, 'vm_platform.dill')))
                 return self.parse_kernel_service_snapshot()
             else:
                 self.unsupported('dart', arg)
@@ -509,7 +508,7 @@ def parse_compile_platform(self):
                     if sdk.endswith('libraries.json'):
                         sdk = os.path.dirname(sdk)
                     self.extra_paths.add(self.rebase(sdk))
-                elif len(compile_platform_args) == 2:  # vm_outline_strong dill
+                elif len(compile_platform_args) == 2:  # vm_outline dill
                     arg = self.rebase(arg)
                 elif len(compile_platform_args) == 3:  # platform dill
                     arg = self.rebase(arg)

pkg/dart2bytecode/lib/dart2bytecode.dart

@@ -37,7 +37,7 @@ import 'options.dart' show BytecodeOptions;
 
 final ArgParser _argParser = ArgParser(allowTrailingOptions: true)
   ..addOption('platform',
-      help: 'Path to vm_platform_strong.dill file', defaultsTo: null)
+      help: 'Path to vm_platform.dill file', defaultsTo: null)
   ..addOption('packages',
       help: 'Path to .dart_tool/package_config.json file', defaultsTo: null)
   ..addOption('output',
@@ -89,7 +89,7 @@ final ArgParser _argParser = ArgParser(allowTrailingOptions: true)
       defaultsTo: Verbosity.defaultValue);
 
 final String _usage = '''
-Usage: dart2bytecode --platform vm_platform_strong.dill [--import-dill host_app.dill] [--validate dynamic_interface.yaml] [options] input.dart
+Usage: dart2bytecode --platform vm_platform.dill [--import-dill host_app.dill] [--validate dynamic_interface.yaml] [options] input.dart
 Compiles Dart sources to Dart bytecode.
 
 Options:

pkg/dart2bytecode/test/bytecode_generator_test.dart

@@ -60,7 +60,7 @@ runTestCase(Uri source) async {
 Future<Component> compileTestCaseToKernelProgram(Uri sourceUri,
     {required Target target}) async {
   final platformKernel =
-      computePlatformBinariesLocation().resolve('vm_platform_strong.dill');
+      computePlatformBinariesLocation().resolve('vm_platform.dill');
   final options = CompilerOptions()
     ..target = target
     ..additionalDills = <Uri>[platformKernel]

pkg/dart2native/lib/dart2native.dart

@@ -29,13 +29,13 @@ final platformDill = path.join(
   binDir.parent.path,
   'lib',
   '_internal',
-  'vm_platform_strong.dill',
+  'vm_platform.dill',
 );
 final productPlatformDill = path.join(
   binDir.parent.path,
   'lib',
   '_internal',
-  'vm_platform_strong_product.dill',
+  'vm_platform_product.dill',
 );
 
 // Maximum page size across all supported architectures (arm64 macOS has 16K

pkg/dev_compiler/test/hot_reload_suite.dart

@@ -1793,7 +1793,7 @@ class D8SuiteRunner extends DdcFeServerSuiteRunner with D8TestRunner {
 class VMSuiteRunner extends HotReloadFeServerSuiteRunner {
   final String vmPlatformDillFromSdkRoot = fe_shared.relativizeUri(
     sdkRoot,
-    buildRootUri.resolve('vm_platform_strong.dill'),
+    buildRootUri.resolve('vm_platform.dill'),
     fe_shared.isWindows,
   );
   late Uri outputDirectoryUri;

pkg/dynamic_modules/test/runner/util.dart

@@ -99,7 +99,7 @@ Uri dart2bytecodeSnapshot = buildRootUri.resolve(
 Uri aotRuntimeBin = buildRootUri.resolve(
   useProduct ? 'dartaotruntime_product' : 'dartaotruntime',
 );
-Uri vmPlatformDill = buildRootUri.resolve('vm_platform_strong.dill');
+Uri vmPlatformDill = buildRootUri.resolve('vm_platform.dill');
 
 Uri dart2wasmSnapshot = dartBin.resolve('snapshots/dart2wasm_product.snapshot');
 Uri dart2wasmPlatformDill = buildRootUri.resolve('dart2wasm_platform.dill');

pkg/front_end/lib/src/base/processed_options.dart

@@ -820,7 +820,7 @@ class ProcessedOptions {
       // Infer based on the sdkRoot, but only when `compileSdk` is false,
       // otherwise the default intent was to compile the sdk from sources and
       // not to load an sdk summary file.
-      _sdkSummary = root?.resolve("vm_platform_strong.dill");
+      _sdkSummary = root?.resolve("vm_platform.dill");
     }
 
     if (_raw.librariesSpecificationUri != null) {

pkg/front_end/lib/src/compute_platform_binaries_location.dart

@@ -28,11 +28,9 @@ String? computePlatformDillName(Target target, void Function() onError) {
     case 'dart2js_server':
       return 'dart2js_server_platform.dill';
     case 'vm':
-      // TODO(johnniwinther): Stop generating 'vm_platform.dill' and rename
-      // 'vm_platform_strong.dill' to 'vm_platform.dill'.
-      return "vm_platform_strong.dill";
+      return 'vm_platform.dill';
     case 'none':
-      return "vm_platform_strong.dill";
+      return 'vm_platform.dill';
     case 'wasm':
       return 'dart2wasm_outline.dill';
     // Coverage-ignore(suite): Not run.