Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 { | 5 { |
| 6 'variables': { | 6 'variables': { |
| 7 'remoting_host_installer_mac_roots': [ | 7 'remoting_host_installer_mac_roots': [ |
| 8 'host/installer/mac/', | 8 'host/installer/mac/', |
| 9 '<(DEPTH)/chrome/installer/mac/', | 9 '<(DEPTH)/chrome/installer/mac/', |
| 10 ], | 10 ], |
| (...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 171 'target_name': 'remoting_host_prefpane', | 171 'target_name': 'remoting_host_prefpane', |
| 172 'type': 'loadable_module', | 172 'type': 'loadable_module', |
| 173 'mac_bundle': 1, | 173 'mac_bundle': 1, |
| 174 'product_extension': 'prefPane', | 174 'product_extension': 'prefPane', |
| 175 'variables': { | 175 'variables': { |
| 176 'bundle_id': '<!(python <(version_py_path) -f <(branding_path) -t "@MAC_ PREFPANE_BUNDLE_ID@")', | 176 'bundle_id': '<!(python <(version_py_path) -f <(branding_path) -t "@MAC_ PREFPANE_BUNDLE_ID@")', |
| 177 'host_bundle_name': '<!(python <(version_py_path) -f <(branding_path) -t "@MAC_HOST_BUNDLE_NAME@")', | 177 'host_bundle_name': '<!(python <(version_py_path) -f <(branding_path) -t "@MAC_HOST_BUNDLE_NAME@")', |
| 178 'prefpane_bundle_name': '<!(python <(version_py_path) -f <(branding_path ) -t "@MAC_PREFPANE_BUNDLE_NAME@")', | 178 'prefpane_bundle_name': '<!(python <(version_py_path) -f <(branding_path ) -t "@MAC_PREFPANE_BUNDLE_NAME@")', |
| 179 }, | 179 }, |
| 180 'dependencies': [ | 180 'dependencies': [ |
| 181 'remoting_base', | |
| 182 'remoting_host', | |
| 181 'remoting_infoplist_strings', | 183 'remoting_infoplist_strings', |
| 184 '<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp', | |
| 182 ], | 185 ], |
| 183 'defines': [ | 186 'defines': [ |
| 184 'HOST_BUNDLE_NAME="<(host_bundle_name)"', | 187 'HOST_BUNDLE_NAME="<(host_bundle_name)"', |
| 185 'PREFPANE_BUNDLE_NAME="<(prefpane_bundle_name)"', | 188 'PREFPANE_BUNDLE_NAME="<(prefpane_bundle_name)"', |
| 186 'JSON_USE_EXCEPTION=0', | 189 'JSON_USE_EXCEPTION=0', |
| 187 ], | 190 ], |
| 188 'include_dirs': [ | 191 'include_dirs': [ |
| 189 '../third_party/jsoncpp/overrides/include/', | 192 '../third_party/jsoncpp/overrides/include/', |
| 190 '../third_party/jsoncpp/source/include/', | 193 '../third_party/jsoncpp/source/include/', |
| 191 '../third_party/jsoncpp/source/src/lib_json/', | 194 '../third_party/jsoncpp/source/src/lib_json/', |
| 192 ], | 195 ], |
| 193 | |
| 194 # These source files are included directly, instead of adding target | |
| 195 # dependencies, because the targets are not yet built for 64-bit on | |
| 196 # Mac OS X - http://crbug.com/125116. | |
| 197 # | |
| 198 # TODO(lambroslambrou): Fix this when Chrome supports building for | |
| 199 # Mac OS X 64-bit - http://crbug.com/128122. | |
| 200 'sources': [ | 196 'sources': [ |
| 201 '../third_party/jsoncpp/overrides/src/lib_json/json_value.cpp', | |
| 202 '../third_party/jsoncpp/overrides/src/lib_json/json_reader.cpp', | |
| 203 '../third_party/jsoncpp/source/src/lib_json/json_writer.cpp', | |
| 204 '../third_party/modp_b64/modp_b64.cc', | |
| 205 'host/constants_mac.cc', | |
| 206 'host/constants_mac.h', | |
| 207 'host/host_config_constants.cc', | |
| 208 'host/mac/me2me_preference_pane.h', | 197 'host/mac/me2me_preference_pane.h', |
| 209 'host/mac/me2me_preference_pane.mm', | 198 'host/mac/me2me_preference_pane.mm', |
| 210 'host/mac/me2me_preference_pane_confirm_pin.h', | 199 'host/mac/me2me_preference_pane_confirm_pin.h', |
| 211 'host/mac/me2me_preference_pane_confirm_pin.mm', | 200 'host/mac/me2me_preference_pane_confirm_pin.mm', |
| 212 'host/mac/me2me_preference_pane_disable.h', | 201 'host/mac/me2me_preference_pane_disable.h', |
| 213 'host/mac/me2me_preference_pane_disable.mm', | 202 'host/mac/me2me_preference_pane_disable.mm', |
| 214 ], | 203 ], |
| 215 'link_settings': { | 204 'link_settings': { |
| 216 'libraries': [ | 205 'libraries': [ |
| 217 '$(SDKROOT)/System/Library/Frameworks/Cocoa.framework', | 206 '$(SDKROOT)/System/Library/Frameworks/Cocoa.framework', |
| 218 '$(SDKROOT)/System/Library/Frameworks/CoreFoundation.framework', | 207 '$(SDKROOT)/System/Library/Frameworks/CoreFoundation.framework', |
| 219 '$(SDKROOT)/System/Library/Frameworks/PreferencePanes.framework', | 208 '$(SDKROOT)/System/Library/Frameworks/PreferencePanes.framework', |
| 220 '$(SDKROOT)/System/Library/Frameworks/Security.framework', | 209 '$(SDKROOT)/System/Library/Frameworks/Security.framework', |
| 221 ], | 210 ], |
| 222 }, | 211 }, |
| 223 'xcode_settings': { | 212 'xcode_settings': { |
| 224 'ARCHS': ['i386', 'x86_64'], | |
|
Nico
2016/01/04 16:28:42
Doesn't this break using the remoting prefpane on
Sergey Ulanov
2016/01/04 18:12:24
The host is compiled for 64-bit only. I assumed th
| |
| 225 'GCC_ENABLE_OBJC_GC': 'supported', | 213 'GCC_ENABLE_OBJC_GC': 'supported', |
| 226 'INFOPLIST_FILE': 'host/mac/me2me_preference_pane-Info.plist', | 214 'INFOPLIST_FILE': 'host/mac/me2me_preference_pane-Info.plist', |
| 227 'INFOPLIST_PREPROCESS': 'YES', | 215 'INFOPLIST_PREPROCESS': 'YES', |
| 228 'INFOPLIST_PREPROCESSOR_DEFINITIONS': 'VERSION_FULL="<(version_full)" VE RSION_SHORT="<(version_short)" BUNDLE_ID="<(bundle_id)"', | 216 'INFOPLIST_PREPROCESSOR_DEFINITIONS': 'VERSION_FULL="<(version_full)" VE RSION_SHORT="<(version_short)" BUNDLE_ID="<(bundle_id)"', |
| 229 }, | 217 }, |
| 230 'mac_bundle_resources': [ | 218 'mac_bundle_resources': [ |
| 231 'host/mac/me2me_preference_pane.xib', | 219 'host/mac/me2me_preference_pane.xib', |
| 232 'host/mac/me2me_preference_pane_confirm_pin.xib', | 220 'host/mac/me2me_preference_pane_confirm_pin.xib', |
| 233 'host/mac/me2me_preference_pane_disable.xib', | 221 'host/mac/me2me_preference_pane_disable.xib', |
| 234 'host/mac/me2me_preference_pane-Info.plist', | 222 'host/mac/me2me_preference_pane-Info.plist', |
| (...skipping 12 matching lines...) Expand all Loading... | |
| 247 'variables': { | 235 'variables': { |
| 248 # A real .dSYM is needed for dump_syms to operate on. | 236 # A real .dSYM is needed for dump_syms to operate on. |
| 249 'mac_real_dsym': 1, | 237 'mac_real_dsym': 1, |
| 250 }, | 238 }, |
| 251 }], # 'mac_breakpad==1' | 239 }], # 'mac_breakpad==1' |
| 252 ], # conditions | 240 ], # conditions |
| 253 }, # end of target 'remoting_host_prefpane' | 241 }, # end of target 'remoting_host_prefpane' |
| 254 ], # end of 'targets' | 242 ], # end of 'targets' |
| 255 | 243 |
| 256 } | 244 } |
| OLD | NEW |