Switch to the Win32 Windows embedding (#39836)

Pulls the Win32 embedding artifacts instead of the GLFW versions for
Windows.

Fixes #38590

packages/flutter_tools/lib/src/build_system/targets/windows.dart

@@ -23,16 +23,16 @@ class UnpackWindows extends Target {
 
   @override
   List<Source> get outputs => const <Source>[
-    Source.pattern('{PROJECT_DIR}/windows/flutter/flutter_windows_glfw.dll'),
-    Source.pattern('{PROJECT_DIR}/windows/flutter/flutter_windows_glfw.dll.exp'),
-    Source.pattern('{PROJECT_DIR}/windows/flutter/flutter_windows_glfw.dll.lib'),
-    Source.pattern('{PROJECT_DIR}/windows/flutter/flutter_windows_glfw.dll.pdb'),
+    Source.pattern('{PROJECT_DIR}/windows/flutter/flutter_windows.dll'),
+    Source.pattern('{PROJECT_DIR}/windows/flutter/flutter_windows.dll.exp'),
+    Source.pattern('{PROJECT_DIR}/windows/flutter/flutter_windows.dll.lib'),
+    Source.pattern('{PROJECT_DIR}/windows/flutter/flutter_windows.dll.pdb'),
     Source.pattern('{PROJECT_DIR}/windows/flutter/flutter_export.h'),
     Source.pattern('{PROJECT_DIR}/windows/flutter/flutter_messenger.h'),
     Source.pattern('{PROJECT_DIR}/windows/flutter/flutter_plugin_registrar.h'),
-    Source.pattern('{PROJECT_DIR}/windows/flutter/flutter_glfw.h'),
+    Source.pattern('{PROJECT_DIR}/windows/flutter/flutter_windows.h'),
     Source.pattern('{PROJECT_DIR}/windows/flutter/icudtl.dat'),
-    Source.pattern('{PROJECT_DIR}/windows/flutter/cpp_client_wrapper_glfw/*'),
+    Source.pattern('{PROJECT_DIR}/windows/flutter/cpp_client_wrapper/*'),
   ];
 
   @override

packages/flutter_tools/lib/src/cache.dart

@@ -1052,8 +1052,8 @@ void _ensureExists(Directory directory) {
 }
 
 const List<List<String>> _windowsDesktopBinaryDirs = <List<String>>[
-  <String>['windows-x64', 'windows-x64/windows-x64-flutter-glfw.zip'],
-  <String>['windows-x64', 'windows-x64/flutter-cpp-client-wrapper-glfw.zip'],
+  <String>['windows-x64', 'windows-x64/windows-x64-flutter.zip'],
+  <String>['windows-x64', 'windows-x64/flutter-cpp-client-wrapper.zip'],
 ];
 
 const List<List<String>> _linuxDesktopBinaryDirs = <List<String>>[

packages/flutter_tools/lib/src/commands/unpack.dart

@@ -36,16 +36,16 @@ const Map<TargetPlatform, List<String>> artifactFilesByPlatform = <TargetPlatfor
     'FlutterMacOS.framework',
   ],
   TargetPlatform.windows_x64: <String>[
-    'flutter_windows_glfw.dll',
-    'flutter_windows_glfw.dll.exp',
-    'flutter_windows_glfw.dll.lib',
-    'flutter_windows_glfw.dll.pdb',
+    'flutter_windows.dll',
+    'flutter_windows.dll.exp',
+    'flutter_windows.dll.lib',
+    'flutter_windows.dll.pdb',
     'flutter_export.h',
     'flutter_messenger.h',
     'flutter_plugin_registrar.h',
-    'flutter_glfw.h',
+    'flutter_windows.h',
     'icudtl.dat',
-    'cpp_client_wrapper_glfw/',
+    'cpp_client_wrapper/',
   ],
 };
 

packages/flutter_tools/test/general.shard/build_system/targets/windows_test.dart

@@ -37,16 +37,16 @@ void main() {
       );
       fs.file(r'C:\bin\cache\artifacts\engine\windows-x64\flutter_export.h').createSync(recursive: true);
       fs.file(r'C:\bin\cache\artifacts\engine\windows-x64\flutter_messenger.h').createSync();
-      fs.file(r'C:\bin\cache\artifacts\engine\windows-x64\flutter_windows_glfw.dll').createSync();
-      fs.file(r'C:\bin\cache\artifacts\engine\windows-x64\flutter_windows_glfw.dll.exp').createSync();
-      fs.file(r'C:\bin\cache\artifacts\engine\windows-x64\flutter_windows_glfw.dll.lib').createSync();
-      fs.file(r'C:\bin\cache\artifacts\engine\windows-x64\flutter_windows_glfw.dll.pdb').createSync();
+      fs.file(r'C:\bin\cache\artifacts\engine\windows-x64\flutter_windows.dll').createSync();
+      fs.file(r'C:\bin\cache\artifacts\engine\windows-x64\flutter_windows.dll.exp').createSync();
+      fs.file(r'C:\bin\cache\artifacts\engine\windows-x64\flutter_windows.dll.lib').createSync();
+      fs.file(r'C:\bin\cache\artifacts\engine\windows-x64\flutter_windows.dll.pdb').createSync();
       fs.file(r'C:\bin\cache\artifacts\engine\windows-x64\lutter_export.h').createSync();
       fs.file(r'C:\bin\cache\artifacts\engine\windows-x64\flutter_messenger.h').createSync();
       fs.file(r'C:\bin\cache\artifacts\engine\windows-x64\flutter_plugin_registrar.h').createSync();
-      fs.file(r'C:\bin\cache\artifacts\engine\windows-x64\flutter_glfw.h').createSync();
+      fs.file(r'C:\bin\cache\artifacts\engine\windows-x64\flutter_windows.h').createSync();
       fs.file(r'C:\bin\cache\artifacts\engine\windows-x64\icudtl.dat').createSync();
-      fs.file(r'C:\bin\cache\artifacts\engine\windows-x64\cpp_client_wrapper_glfw\foo').createSync(recursive: true);
+      fs.file(r'C:\bin\cache\artifacts\engine\windows-x64\cpp_client_wrapper\foo').createSync(recursive: true);
       fs.file(r'C:\packages\flutter_tools\lib\src\build_system\targets\windows.dart').createSync(recursive: true);
       fs.directory('windows').createSync();
     }, overrides: <Type, Generator>{
@@ -60,16 +60,16 @@ void main() {
 
     expect(fs.file(r'C:\windows\flutter\flutter_export.h').existsSync(), true);
     expect(fs.file(r'C:\windows\flutter\flutter_messenger.h').existsSync(), true);
-    expect(fs.file(r'C:\windows\flutter\flutter_windows_glfw.dll').existsSync(), true);
-    expect(fs.file(r'C:\windows\flutter\flutter_windows_glfw.dll.exp').existsSync(), true);
-    expect(fs.file(r'C:\windows\flutter\flutter_windows_glfw.dll.lib').existsSync(), true);
-    expect(fs.file(r'C:\windows\flutter\flutter_windows_glfw.dll.pdb').existsSync(), true);
+    expect(fs.file(r'C:\windows\flutter\flutter_windows.dll').existsSync(), true);
+    expect(fs.file(r'C:\windows\flutter\flutter_windows.dll.exp').existsSync(), true);
+    expect(fs.file(r'C:\windows\flutter\flutter_windows.dll.lib').existsSync(), true);
+    expect(fs.file(r'C:\windows\flutter\flutter_windows.dll.pdb').existsSync(), true);
     expect(fs.file(r'C:\windows\flutter\flutter_export.h').existsSync(), true);
     expect(fs.file(r'C:\windows\flutter\flutter_messenger.h').existsSync(), true);
     expect(fs.file(r'C:\windows\flutter\flutter_plugin_registrar.h').existsSync(), true);
-    expect(fs.file(r'C:\windows\flutter\flutter_glfw.h').existsSync(), true);
+    expect(fs.file(r'C:\windows\flutter\flutter_windows.h').existsSync(), true);
     expect(fs.file(r'C:\windows\flutter\icudtl.dat').existsSync(), true);
-    expect(fs.file(r'C:\windows\flutter\cpp_client_wrapper_glfw\foo').existsSync(), true);
+    expect(fs.file(r'C:\windows\flutter\cpp_client_wrapper\foo').existsSync(), true);
   }));
 
   test('Does not re-copy files unecessarily', () => testbed.run(() async {