diff options
| author | weitaosu@chromium.org <weitaosu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-31 23:39:17 +0000 |
|---|---|---|
| committer | weitaosu@chromium.org <weitaosu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-31 23:39:17 +0000 |
| commit | 4d3e213b0c7e53d435b332289c93bbfdbe56bc0a (patch) | |
| tree | 3c20ea864b4df2bcabc4d4e35cfeb44cb4688201 /remoting/remoting_host_mac.gypi | |
| parent | cb40265b0c3db421ff9da434284badee5e2992f0 (diff) | |
| download | chromium_src-4d3e213b0c7e53d435b332289c93bbfdbe56bc0a.zip chromium_src-4d3e213b0c7e53d435b332289c93bbfdbe56bc0a.tar.gz chromium_src-4d3e213b0c7e53d435b332289c93bbfdbe56bc0a.tar.bz2 | |
Pull the me2me host and prefpane bundle names from branding_chrom*.
BUG=
Review URL: https://codereview.chromium.org/210093006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@260706 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/remoting_host_mac.gypi')
| -rw-r--r-- | remoting/remoting_host_mac.gypi | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/remoting/remoting_host_mac.gypi b/remoting/remoting_host_mac.gypi index 61d4a8c..8ae28dd 100644 --- a/remoting/remoting_host_mac.gypi +++ b/remoting/remoting_host_mac.gypi @@ -34,11 +34,17 @@ 'mac_bundle': 1, 'variables': { 'bundle_id': '<!(python <(version_py_path) -f <(branding_path) -t "@MAC_UNINSTALLER_BUNDLE_ID@")', + '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@")', }, 'dependencies': [ '<(DEPTH)/base/base.gyp:base', 'remoting_infoplist_strings', ], + 'defines': [ + 'HOST_BUNDLE_NAME="<(host_bundle_name)"', + 'PREFPANE_BUNDLE_NAME="<(prefpane_bundle_name)"', + ], 'sources': [ 'host/constants_mac.cc', 'host/constants_mac.h', @@ -169,12 +175,19 @@ 'type': 'loadable_module', 'mac_bundle': 1, 'product_extension': 'prefPane', - 'defines': [ - 'JSON_USE_EXCEPTION=0', - ], + 'variables': { + 'bundle_id': '<!(python <(version_py_path) -f <(branding_path) -t "@MAC_PREFPANE_BUNDLE_ID@")', + '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@")', + }, 'dependencies': [ 'remoting_infoplist_strings', ], + 'defines': [ + 'HOST_BUNDLE_NAME="<(host_bundle_name)"', + 'PREFPANE_BUNDLE_NAME="<(prefpane_bundle_name)"', + 'JSON_USE_EXCEPTION=0', + ], 'include_dirs': [ '../third_party/jsoncpp/overrides/include/', '../third_party/jsoncpp/source/include/', @@ -210,9 +223,6 @@ '$(SDKROOT)/System/Library/Frameworks/Security.framework', ], }, - 'variables': { - 'bundle_id': '<!(python <(version_py_path) -f <(branding_path) -t "@MAC_PREFPANE_BUNDLE_ID@")', - }, 'xcode_settings': { 'ARCHS': ['i386', 'x86_64'], 'GCC_ENABLE_OBJC_GC': 'supported', |