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

Side by Side Diff: remoting/remoting.gyp

Issue 10389178: mac: Unbreak shared build. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 7 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 | Annotate | Revision Log
« 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 (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 # TODO(dmaclach): can we pick this up some other way? Right now it's 7 # TODO(dmaclach): can we pick this up some other way? Right now it's
8 # duplicated from chrome.gyp 8 # duplicated from chrome.gyp
9 'chromium_code': 1, 9 'chromium_code': 1,
10 # Use consistent strings across all platforms. Note that the plugin name 10 # Use consistent strings across all platforms. Note that the plugin name
(...skipping 378 matching lines...) Expand 10 before | Expand all | Expand 10 after
389 'include_dirs': [ 389 'include_dirs': [
390 '../third_party/jsoncpp/overrides/include/', 390 '../third_party/jsoncpp/overrides/include/',
391 '../third_party/jsoncpp/source/include/', 391 '../third_party/jsoncpp/source/include/',
392 '../third_party/jsoncpp/source/src/lib_json/', 392 '../third_party/jsoncpp/source/src/lib_json/',
393 ], 393 ],
394 'sources': [ 394 'sources': [
395 # The jsoncpp target is not yet built for Mac OS X 64-bit, so 395 # The jsoncpp target is not yet built for Mac OS X 64-bit, so
396 # include the files directly, instead of depending on the target. 396 # include the files directly, instead of depending on the target.
397 '../third_party/jsoncpp/source/src/lib_json/json_reader.cpp', 397 '../third_party/jsoncpp/source/src/lib_json/json_reader.cpp',
398 '../third_party/jsoncpp/source/src/lib_json/json_writer.cpp', 398 '../third_party/jsoncpp/source/src/lib_json/json_writer.cpp',
399 '../third_party/modp_b64/modp_b64.cc',
399 'host/me2me_preference_pane.h', 400 'host/me2me_preference_pane.h',
400 'host/me2me_preference_pane.mm', 401 'host/me2me_preference_pane.mm',
401 ], 402 ],
402 'link_settings': { 403 'link_settings': {
403 'libraries': [ 404 'libraries': [
404 '$(SDKROOT)/System/Library/Frameworks/PreferencePanes.framework', 405 '$(SDKROOT)/System/Library/Frameworks/PreferencePanes.framework',
405 ], 406 ],
406 }, 407 },
407 'xcode_settings': { 408 'xcode_settings': {
408 'INFOPLIST_FILE': 'host/me2me_preference_pane-Info.plist', 409 'INFOPLIST_FILE': 'host/me2me_preference_pane-Info.plist',
(...skipping 1363 matching lines...) Expand 10 before | Expand all | Expand 10 after
1772 '../base/allocator/allocator.gyp:allocator', 1773 '../base/allocator/allocator.gyp:allocator',
1773 ], 1774 ],
1774 }, 1775 },
1775 ], 1776 ],
1776 ], 1777 ],
1777 }], 1778 }],
1778 ], # end of 'conditions' 1779 ], # end of 'conditions'
1779 }, # end of target 'remoting_unittests' 1780 }, # end of target 'remoting_unittests'
1780 ], # end of targets 1781 ], # end of targets
1781 } 1782 }
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