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

Side by Side Diff: remoting/remoting_host_mac.gypi

Issue 1410263002: Revert https://codereview.chromium.org/1408263002/ for remoting_host_prefpane. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
219 '$(SDKROOT)/System/Library/Frameworks/PreferencePanes.framework', 219 '$(SDKROOT)/System/Library/Frameworks/PreferencePanes.framework',
220 '$(SDKROOT)/System/Library/Frameworks/Security.framework', 220 '$(SDKROOT)/System/Library/Frameworks/Security.framework',
221 ], 221 ],
222 }, 222 },
223 'xcode_settings': { 223 'xcode_settings': {
224 'ARCHS': ['i386', 'x86_64'], 224 'ARCHS': ['i386', 'x86_64'],
225 'GCC_ENABLE_OBJC_GC': 'supported', 225 'GCC_ENABLE_OBJC_GC': 'supported',
226 'INFOPLIST_FILE': 'host/mac/me2me_preference_pane-Info.plist', 226 'INFOPLIST_FILE': 'host/mac/me2me_preference_pane-Info.plist',
227 'INFOPLIST_PREPROCESS': 'YES', 227 'INFOPLIST_PREPROCESS': 'YES',
228 'INFOPLIST_PREPROCESSOR_DEFINITIONS': 'VERSION_FULL="<(version_full)" VE RSION_SHORT="<(version_short)" BUNDLE_ID="<(bundle_id)"', 228 'INFOPLIST_PREPROCESSOR_DEFINITIONS': 'VERSION_FULL="<(version_full)" VE RSION_SHORT="<(version_short)" BUNDLE_ID="<(bundle_id)"',
229
230 'conditions': [
231 ['component=="shared_library"', {
232 # TODO(thakis): Figure out why this is needed,
233 # http://crbug.com/544531
234 'CLANG_CXX_LIBRARY': 'libstdc++', # -stdlib=libstdc++
235 }],
236 ],
229 }, 237 },
230 'mac_bundle_resources': [ 238 'mac_bundle_resources': [
231 'host/mac/me2me_preference_pane.xib', 239 'host/mac/me2me_preference_pane.xib',
232 'host/mac/me2me_preference_pane_confirm_pin.xib', 240 'host/mac/me2me_preference_pane_confirm_pin.xib',
233 'host/mac/me2me_preference_pane_disable.xib', 241 'host/mac/me2me_preference_pane_disable.xib',
234 'host/mac/me2me_preference_pane-Info.plist', 242 'host/mac/me2me_preference_pane-Info.plist',
235 'resources/chromoting128.png', 243 'resources/chromoting128.png',
236 244
237 # Localized strings for 'Info.plist' 245 # Localized strings for 'Info.plist'
238 '<!@pymod_do_main(remoting_localize --locale_output ' 246 '<!@pymod_do_main(remoting_localize --locale_output '
239 '"<(SHARED_INTERMEDIATE_DIR)/remoting/me2me_preference_pane-InfoPlist.st rings/@{json_suffix}.lproj/InfoPlist.strings" ' 247 '"<(SHARED_INTERMEDIATE_DIR)/remoting/me2me_preference_pane-InfoPlist.st rings/@{json_suffix}.lproj/InfoPlist.strings" '
240 '--print_only <(remoting_locales))', 248 '--print_only <(remoting_locales))',
241 ], 249 ],
242 'mac_bundle_resources!': [ 250 'mac_bundle_resources!': [
243 'host/mac/me2me_preference_pane-Info.plist', 251 'host/mac/me2me_preference_pane-Info.plist',
244 ], 252 ],
245 'conditions': [ 253 'conditions': [
246 ['mac_breakpad==1', { 254 ['mac_breakpad==1', {
247 'variables': { 255 'variables': {
248 # A real .dSYM is needed for dump_syms to operate on. 256 # A real .dSYM is needed for dump_syms to operate on.
249 'mac_real_dsym': 1, 257 'mac_real_dsym': 1,
250 }, 258 },
251 }], # 'mac_breakpad==1' 259 }], # 'mac_breakpad==1'
252 ], # conditions 260 ], # conditions
253 }, # end of target 'remoting_host_prefpane' 261 }, # end of target 'remoting_host_prefpane'
254 ], # end of 'targets' 262 ], # end of 'targets'
255 263
256 } 264 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698