Fixing the broken CRD Windows MSI

remoting/host/BUILD.gn

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//build/config/win/manifest.gni")
 import("//build/util/version.gni")
 import("//chrome/version.gni")
 import("//remoting/remoting_enable.gni")
@@ skipping 1280 matching lines @@
         "$root_out_dir/remoting_host.exe",
         "$root_out_dir/remoting_native_messaging_host.exe",
         "$root_out_dir/remoting_start_host.exe",
         "$root_gen_dir/remoting/CREDITS.txt",
         "$root_out_dir/remoting/com.google.chrome.remote_assistance.json",
         "$root_out_dir/remoting/com.google.chrome.remote_desktop.json",
         "$root_out_dir/icudtl.dat",
       ]
 
       _generated_files = rebase_path(inputs, root_build_dir)
-      _extra_files = []
+      _generated_files += [ rebase_path("//remoting/resources/chromoting.ico") ]
+
+      # _generated_dst_files must contain the same files in the same order as
+      # _generated_files, otherwise the Windows MSI will not be built correctly.
+      _generated_dst_files = [
+        "files/remote_assistance_host.exe",
+        "files/remote_security_key.exe",
+        "files/remoting_core.dll",
+        "files/remoting_desktop.exe",
+        "files/remoting_host.exe",
+        "files/remoting_native_messaging_host.exe",
+        "files/remoting_start_host.exe",
+        "files/CREDITS.txt",
+        "files/com.google.chrome.remote_assistance.json",
+        "files/com.google.chrome.remote_desktop.json",
+        "files/icudtl.dat",
+        "files/chromoting.ico",
+      ]
 
       args =
           [
             rebase_path("$root_gen_dir/remoting_installation", root_build_dir),
             rebase_path(_output, root_build_dir),
             "--source-file-roots",
             rebase_path("//remoting/host/installer/win"),
             "--source-files",
             rebase_path("//remoting/host/installer/win/chromoting.wxs"),
             rebase_path("//remoting/host/installer/win/parameters.json"),
 
             # Input files
             "--generated-files",
           ] + _generated_files +
           [
-            rebase_path("//remoting/resources/chromoting.ico"),
-
             # Position of files in zip file
             "--generated-files-dst",
-            "files/remote_assistance_host.exe",
-            "files/remote_security_key.exe",
-            "files/remoting_core.dll",
-            "files/remoting_desktop.exe",
-            "files/remoting_host.exe",
-            "files/remoting_native_messaging_host.exe",
-            "files/remoting_start_host.exe",
-            "files/CREDITS.txt",
-            "files/com.google.chrome.remote_assistance.json",
-            "files/com.google.chrome.remote_desktop.json",
-            "files/chromoting.ico",
-            "files/icudtl.dat",
-          ] + _extra_files +  # Defs
+          ] + _generated_dst_files +
           [
+            # Defs
             "--defs",
             "BRANDING=$_branding",
             "DAEMON_CONTROLLER_CLSID={$daemon_controller_clsid}",
             "RDP_DESKTOP_SESSION_CLSID={$rdp_desktop_session_clsid}",
             "VERSION=$chrome_version_full",
             "OFFICIAL_BUILD=$_official_build",
           ]
     }
   } else if (is_mac) {
     import("//build/config/zip.gni")
@@ skipping 313 matching lines @@
                       root_build_dir),
           rebase_path(outputs[0], root_build_dir),
         ]
       }
     } else {
       group("remoting_host_installation") {
       }
     }
   }
 }