diff options
Diffstat (limited to 'remoting/remoting_host_mac.gypi')
| -rw-r--r-- | remoting/remoting_host_mac.gypi | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/remoting/remoting_host_mac.gypi b/remoting/remoting_host_mac.gypi index 79a93bb..61d4a8c 100644 --- a/remoting/remoting_host_mac.gypi +++ b/remoting/remoting_host_mac.gypi @@ -86,6 +86,10 @@ 'host_service_name': '<!(python <(version_py_path) -f <(branding_path) -t "@DAEMON_FILE_NAME@")', 'host_uninstaller_name': '<!(python <(version_py_path) -f <(branding_path) -t "@MAC_UNINSTALLER_NAME@")', 'bundle_prefix': '<!(python <(version_py_path) -f <(branding_path) -t "@MAC_UNINSTALLER_BUNDLE_PREFIX@")', + 'me2me_host_bundle_name': '<!(python <(version_py_path) -f <(branding_path) -t "@MAC_HOST_BUNDLE_NAME@")', + 'prefpane_bundle_name': '<!(python <(version_py_path) -f <(branding_path) -t "@MAC_PREFPANE_BUNDLE_NAME@")', + 'native_messaging_host_bundle_name': '<!(python <(version_py_path) -f <(branding_path) -t "@MAC_NATIVE_MESSAGING_HOST_BUNDLE_NAME@")', + 'remote_assistance_host_bundle_name': '<!(python <(version_py_path) -f <(branding_path) -t "@MAC_REMOTE_ASSISTANCE_HOST_BUNDLE_NAME@")', }, 'actions': [ { @@ -100,20 +104,17 @@ 'generated_files': [ '<(PRODUCT_DIR)/remoting_host_prefpane.prefPane', '<(PRODUCT_DIR)/remoting_me2me_host.app', - '<(PRODUCT_DIR)/remoting_native_messaging_host', - '<(PRODUCT_DIR)/remoting_it2me_native_messaging_host', + '<(PRODUCT_DIR)/native_messaging_host.app', + '<(PRODUCT_DIR)/remote_assistance_host.app', '<(PRODUCT_DIR)/remoting_host_uninstaller.app', '<(PRODUCT_DIR)/remoting/com.google.chrome.remote_desktop.json', '<(PRODUCT_DIR)/remoting/com.google.chrome.remote_assistance.json', ], 'generated_files_dst': [ - 'PreferencePanes/org.chromium.chromoting.prefPane', - - # TODO(sergeyu): Rename org.chromium.chromoting.me2me_host. e.g. - # to com.google.chrome.remote-desktop . - 'PrivilegedHelperTools/org.chromium.chromoting.me2me_host.app', - 'PrivilegedHelperTools/org.chromium.chromoting.me2me_host.app/Contents/MacOS/native_messaging_host', - 'PrivilegedHelperTools/org.chromium.chromoting.me2me_host.app/Contents/MacOS/remote_assistance_host', + 'PreferencePanes/<(prefpane_bundle_name)', + 'PrivilegedHelperTools/<(me2me_host_bundle_name)', + 'PrivilegedHelperTools/<(me2me_host_bundle_name)/Contents/MacOS/<(native_messaging_host_bundle_name)', + 'PrivilegedHelperTools/<(me2me_host_bundle_name)/Contents/MacOS/<(remote_assistance_host_bundle_name)', 'Applications/<(host_uninstaller_name).app', 'Config/com.google.chrome.remote_desktop.json', 'Config/com.google.chrome.remote_assistance.json', @@ -127,6 +128,7 @@ 'VERSION_MAJOR=<(version_major)', 'VERSION_MINOR=<(version_minor)', 'HOST_NAME=<(host_name)', + 'HOST_BUNDLE_NAME=<(me2me_host_bundle_name)', 'HOST_SERVICE_NAME=<(host_service_name)', 'HOST_UNINSTALLER_NAME=<(host_uninstaller_name)', 'HOST_PKG=<(host_name)', @@ -137,6 +139,9 @@ 'BUNDLE_ID_HOST_UNINSTALLER=<(bundle_prefix).<(host_uninstaller_name_nospace)', 'DMG_VOLUME_NAME=<(host_name) <(version_full)', 'DMG_FILE_NAME=<!(echo <(host_name) | sed "s/ //g")-<(version_full)', + 'NATIVE_MESSAGING_HOST_BUNDLE_NAME=<(native_messaging_host_bundle_name)', + 'REMOTE_ASSISTANCE_HOST_BUNDLE_NAME=<(remote_assistance_host_bundle_name)', + 'PREFPANE_BUNDLE_NAME=<(prefpane_bundle_name)', ], 'inputs': [ 'host/installer/build-installer-archive.py', |