Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(119)

Unified Diff: remoting/remoting_host_mac.gypi

Issue 186763004: Add breakpad support for me2me and it2me native messaging host on Mac. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: remoting/remoting_host_mac.gypi
diff --git a/remoting/remoting_host_mac.gypi b/remoting/remoting_host_mac.gypi
index 79a93bbb3ed439973aca9b1011fa0753195c7e72..df23b45f8b9585a91785e95d3318764cbd7ff02a 100644
--- a/remoting/remoting_host_mac.gypi
+++ b/remoting/remoting_host_mac.gypi
@@ -82,10 +82,16 @@
'remoting_native_messaging_manifests',
],
'variables': {
+ 'host_bundle_name': '<!(python <(version_py_path) -f <(branding_path) -t "@MAC_HOST_BUNDLE_NAME@")',
'host_name': '<!(python <(version_py_path) -f <(branding_path) -t "@HOST_PLUGIN_FILE_NAME@")',
'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@")',
Sergey Ulanov 2014/03/08 02:37:56 Can we put the NM host bundle inside the me2me bun
weitao 2014/03/19 07:22:36 Agreed that the NM hosts should be nested in the m
+ 'remote_assistance_host_bundle_name': '<!(python <(version_py_path) -f <(branding_path) -t "@MAC_REMOTE_ASSISTANCE_HOST_BUNDLE_NAME@")',
+ 'remoting_name': '<!(python <(version_py_path) -f <(branding_path) -t "@MAC_REMOTING_NAME@")',
},
'actions': [
{
@@ -100,20 +106,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).app',
+ 'Google/<(remoting_name)/<(native_messaging_host_bundle_name).app',
+ 'Google/<(remoting_name)/<(remote_assistance_host_bundle_name).app',
'Applications/<(host_uninstaller_name).app',
'Config/com.google.chrome.remote_desktop.json',
'Config/com.google.chrome.remote_assistance.json',
@@ -127,6 +130,7 @@
'VERSION_MAJOR=<(version_major)',
'VERSION_MINOR=<(version_minor)',
'HOST_NAME=<(host_name)',
+ 'HOST_BUNDLE_NAME=<(host_bundle_name)',
'HOST_SERVICE_NAME=<(host_service_name)',
'HOST_UNINSTALLER_NAME=<(host_uninstaller_name)',
'HOST_PKG=<(host_name)',
@@ -137,6 +141,10 @@
'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)',
+ 'REMOTING_NAME=<(remoting_name)',
+ 'PREFPANE_BUNDLE_NAME=<(prefpane_bundle_name)',
],
'inputs': [
'host/installer/build-installer-archive.py',

Powered by Google App Engine
This is Rietveld 408576698