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

Side by Side Diff: content/content_browser.gypi

Issue 7743007: Revert 98164 since there are missing dependencies on linux views build - Move resource_dispatcher... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 4 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 | « chrome/chrome_tests.gypi ('k') | content/content_tests.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Property Changes:
Deleted: svn:mergeinfo
OLDNEW
1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'content_browser', 8 'target_name': 'content_browser',
9 'type': 'static_library', 9 'type': 'static_library',
10 'dependencies': [ 10 'dependencies': [
(...skipping 526 matching lines...) Expand 10 before | Expand all | Expand 10 after
537 'browser/renderer_host/p2p/socket_dispatcher_host.cc', 537 'browser/renderer_host/p2p/socket_dispatcher_host.cc',
538 'browser/renderer_host/p2p/socket_dispatcher_host.h', 538 'browser/renderer_host/p2p/socket_dispatcher_host.h',
539 ], 539 ],
540 }], 540 }],
541 ['OS=="win"', { 541 ['OS=="win"', {
542 'dependencies': [ 542 'dependencies': [
543 # For accessibility 543 # For accessibility
544 '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2', 544 '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2',
545 '../third_party/isimpledom/isimpledom.gyp:isimpledom', 545 '../third_party/isimpledom/isimpledom.gyp:isimpledom',
546 ], 546 ],
547 'direct_dependent_settings': {
548 'link_settings': {
549 'libraries': [
550 '-llocationapi.lib',
551 '-lsensorsapi.lib',
552 ],
553 }
554 },
555 'sources!': [ 547 'sources!': [
556 'browser/power_save_blocker_stub.cc', 548 'browser/power_save_blocker_stub.cc',
557 ], 549 ],
558 }], 550 }],
559 ['toolkit_uses_gtk == 1', { 551 ['toolkit_uses_gtk == 1', {
560 'dependencies': [ 552 'dependencies': [
561 '../build/linux/system.gyp:dbus-glib', 553 '../build/linux/system.gyp:dbus-glib',
562 # For FcLangSetAdd call in render_sandbox_host_linux.cc 554 # For FcLangSetAdd call in render_sandbox_host_linux.cc
563 '../build/linux/system.gyp:fontconfig', 555 '../build/linux/system.gyp:fontconfig',
564 '../build/linux/system.gyp:gtk', 556 '../build/linux/system.gyp:gtk',
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
598 ['exclude', '^browser/renderer_host/gtk_im_context_wrapper.cc'], 590 ['exclude', '^browser/renderer_host/gtk_im_context_wrapper.cc'],
599 ['exclude', '^browser/renderer_host/gtk_im_context_wrapper.h'], 591 ['exclude', '^browser/renderer_host/gtk_im_context_wrapper.h'],
600 ['exclude', '^browser/renderer_host/render_widget_host_view_gtk.cc'] , 592 ['exclude', '^browser/renderer_host/render_widget_host_view_gtk.cc'] ,
601 ['exclude', '^browser/renderer_host/render_widget_host_view_gtk.h'], 593 ['exclude', '^browser/renderer_host/render_widget_host_view_gtk.h'],
602 ], 594 ],
603 }], 595 }],
604 ], 596 ],
605 }, 597 },
606 ], 598 ],
607 } 599 }
OLDNEW
« no previous file with comments | « chrome/chrome_tests.gypi ('k') | content/content_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698