[Chromoting] Include pkg-dmg script into installer archive.

remoting/remoting.gyp

 
 # Copyright (c) 2012 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.
 
 {
   'variables': {
     # TODO(dmaclach): can we pick this up some other way? Right now it's
     # duplicated from chrome.gyp
     'chromium_code': 1,
@@ skipping 150 matching lines @@
       'webapp/xhr.js',
       'resources/chromoting16.png',
       'resources/chromoting48.png',
       'resources/chromoting128.png',
       'resources/disclosure_arrow_down.png',
       'resources/disclosure_arrow_right.png',
       'resources/infographic_my_computers.png',
       'resources/infographic_remote_assistance.png',
       'resources/tick.png',
     ],
-    'remoting_host_installer_mac_root': 'host/installer/mac/',
+    'remoting_host_installer_mac_roots': [
+      'host/installer/mac/',
+      '<(DEPTH)/chrome/installer/mac/',
+    ],
     'remoting_host_installer_mac_files': [
       'host/installer/mac/do_signing.sh',
       'host/installer/mac/ChromotingHost.packproj',
       'host/installer/mac/ChromotingHostService.packproj',
       'host/installer/mac/ChromotingHostUninstaller.packproj',
       'host/installer/mac/LaunchAgents/org.chromium.chromoting.plist',
       'host/installer/mac/PrivilegedHelperTools/org.chromium.chromoting.me2me.sh',
       'host/installer/mac/Scripts/keystone_install.sh',
       'host/installer/mac/Scripts/remoting_postflight.sh',
       'host/installer/mac/Scripts/remoting_preflight.sh',
       'host/installer/mac/Keystone/GoogleSoftwareUpdate.pkg.zip',
+      '<(DEPTH)/chrome/installer/mac/pkg-dmg',
     ],
   },
 
   'target_defaults': {
     'defines': [
     ],
     'include_dirs': [
       '..',  # Root of Chrome checkout
     ],
   },
@@ skipping 122 matching lines @@
               'temp_dir': '<(SHARED_INTERMEDIATE_DIR)/remoting/remoting-me2me-host',
               'zip_path': '<(PRODUCT_DIR)/remoting-me2me-host-<(OS).zip',
               'generated_files': [
                 '<(PRODUCT_DIR)/remoting_me2me_host',
                 '<(PRODUCT_DIR)/remoting_host_uninstaller.app',
               ],
               'generated_files_dst': [
                 'PrivilegedHelperTools/org.chromium.chromoting.me2me_host',
                 'Applications/<(host_uninstaller_name).app',
               ],
-              'source_files_root': '<(remoting_host_installer_mac_root)',
               'source_files': [
                 '<@(remoting_host_installer_mac_files)',
               ],
               'defs': [
                 'VERSION=<(version_full)',
                 'VERSION_SHORT=<(version_short)',
                 'VERSION_MAJOR=<!(python <(version_py_path) -f <(version_path) -t "@MAJOR@")',
                 'VERSION_MINOR=<!(python <(version_py_path) -f <(version_path) -t "@MINOR@")',
                 'COPYRIGHT_BY=<(copyright_by)',
                 'HOST_NAME=<(host_name)',
@@ skipping 12 matching lines @@
                 '<@(_source_files)',
               ],
               'outputs': [
                 '<(_zip_path)',
               ],
               'action': [
                 'python',
                 'host/installer/build-installer-archive.py',
                 '<(_temp_dir)',
                 '<(_zip_path)',
-                '<(_source_files_root)',
+                '--source-file-roots',
+                '<@(remoting_host_installer_mac_roots)',
                 '--source-files',
                 '<@(_source_files)',
                 '--generated-files',
                 '<@(_generated_files)',
                 '--generated-files-dst',
                 '<@(_generated_files_dst)',
                 '--defs',
                 '<@(_defs)',
               ],
             },
@@ skipping 1227 matching lines @@
                   '../base/allocator/allocator.gyp:allocator',
                 ],
               },
             ],
           ],
         }],
       ],  # end of 'conditions'
     },  # end of target 'remoting_unittests'
   ],  # end of targets
 }