Fix mac remoting GN build failures.

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 969 matching lines @@
       ]
 
       if (is_mac && is_chrome_branded && is_official_build) {
         defines = [ "REMOTING_ENABLE_BREAKPAD" ]
       }
 
       deps = [
         ":credits",
         ":remoting_me2me_host_static",
         "//build/config/sanitizers:deps",
+        "//remoting/base:breakpad",
         "//remoting/resources",
       ]
       if (is_mac) {
         foreach(locale, remoting_locales_with_underscores) {
           deps += [
             ":remoting_host_locale_${locale}_bundle_data",
             ":remoting_me2me_host_strings_${locale}_bundle_data",
           ]
         }
         deps += [
@@ skipping 226 matching lines @@
                 "$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",
               ],
               root_build_dir)
       _extra_files = []
 
-      args = [
-               rebase_path("$root_gen_dir/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"),
+      args =
+          [
+            rebase_path("$root_gen_dir/remoting_installation", root_build_dir),

[Dirk Pranke, 2016/07/12 20:57:39]

The GYP build actually uses SHARED_INTERMEDIATE_DIR/installation, but I felt
that directory name was dangerously not unique enough.

+            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"),
+            # 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
-             [
-               "--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",
-             ]
+            # 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
+          [
+            "--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")
 
     action("remoting_me2me_host_archive") {
       # TODO(GYP) TODO(crbug.com/622415) This needs work and testing.
 
       # TODO(GYP) At the very least, we need to add in the localized strings.
 
       _installer_mac_files = [
@@ skipping 20 matching lines @@
       ]
 
       script = "installer/build-installer-archive.py"
 
       # TODO(GYP) TODO(crbug.com/622415): Fill these in.
       host_name_nospace = host_name
       host_service_name_nospace = host_service_name
       host_uninstaller_name_nospace = host_uninstaller_name
 
       args = [
-               rebase_path(target_gen_dir, root_build_dir),
+               rebase_path("$target_gen_dir/remoting_installation",
+                           root_build_dir),

[Dirk Pranke, 2016/07/12 20:57:39]

This uses target_gen_dir instead of root_gen_dir, because the dir doesn't need
to be shared between targets, but I re-use "remoting_installation" to be more
consistent w/ the win version. in the GYP build, the mac uses a different name,
but I don't see an obvious reason for it.

                rebase_path(zip_path, root_build_dir),
                "--source-file-roots",
                rebase_path("installer/mac/", root_build_dir),
                rebase_path("//chrome/installer/mac", root_build_dir),
                "--source-files",
              ] + rebase_path(_installer_mac_files, root_build_dir) + [
                "--generated-files",
                "remoting_host_prefpane.prefPane",
                "remoting_me2me_host.app",
                "native_messaging_host.app",
@@ skipping 213 matching lines @@
           "//remoting/host:remoting_me2me_host_archive",
         ]
         script = "../tools/zip2msi.py"
         outputs = [
           "$root_out_dir/chromoting.msi",
         ]
         args = [
           "--wix_path",
           rebase_path("//third_party/wix"),
           "--intermediate_dir",
-          rebase_path("$root_gen_dir/installation", root_build_dir),
+          rebase_path("$root_gen_dir/remoting_installation", root_build_dir),
           "--target_arch",
           msi_script_arch,
           rebase_path("$root_out_dir/remoting-me2me-host-$current_os.zip",
                       root_build_dir),
           rebase_path(outputs[0], root_build_dir),
         ]
       }
     } else {
       group("remoting_host_installation") {
       }
     }
   }
 }