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

Side by Side Diff: chrome/chrome.gyp

Issue 6691004: Move worker code from chrome\worker to content\worker. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 9 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 | chrome/chrome_dll.gypi » ('j') | 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) 2010 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2010 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 'variables': { 5 'variables': {
6 'chromium_code': 1, 6 'chromium_code': 1,
7 7
8 'variables': { 8 'variables': {
9 'version_py_path': 'tools/build/version.py', 9 'version_py_path': 'tools/build/version.py',
10 'version_path': 'VERSION', 10 'version_path': 'VERSION',
(...skipping 10 matching lines...) Expand all
21 # the link of the actual chrome (or chromium) executable on 21 # the link of the actual chrome (or chromium) executable on
22 # Linux or Mac, and into chrome.dll on Windows. 22 # Linux or Mac, and into chrome.dll on Windows.
23 'chromium_dependencies': [ 23 'chromium_dependencies': [
24 'common', 24 'common',
25 'browser', 25 'browser',
26 'ppapi_plugin', 26 'ppapi_plugin',
27 'profile_import', 27 'profile_import',
28 'renderer', 28 'renderer',
29 'syncapi', 29 'syncapi',
30 'utility', 30 'utility',
31 'worker',
32 'service', 31 'service',
33 '../content/content.gyp:content_gpu', 32 '../content/content.gyp:content_gpu',
33 '../content/content.gyp:content_worker',
34 '../printing/printing.gyp:printing', 34 '../printing/printing.gyp:printing',
35 '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:inspector_resourc es', 35 '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:inspector_resourc es',
36 ], 36 ],
37 'nacl_win64_dependencies': [ 37 'nacl_win64_dependencies': [
38 'common_nacl_win64', 38 'common_nacl_win64',
39 'common_constants_win64', 39 'common_constants_win64',
40 'installer_util_nacl_win64', 40 'installer_util_nacl_win64',
41 ], 41 ],
42 'allocator_target': '../base/allocator/allocator.gyp:allocator', 42 'allocator_target': '../base/allocator/allocator.gyp:allocator',
43 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome', 43 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome',
(...skipping 611 matching lines...) Expand 10 before | Expand all | Expand 10 after
655 'ppapi_plugin/ppapi_process.cc', 655 'ppapi_plugin/ppapi_process.cc',
656 'ppapi_plugin/ppapi_process.h', 656 'ppapi_plugin/ppapi_process.h',
657 'ppapi_plugin/ppapi_thread.cc', 657 'ppapi_plugin/ppapi_thread.cc',
658 'ppapi_plugin/ppapi_thread.h', 658 'ppapi_plugin/ppapi_thread.h',
659 ], 659 ],
660 'include_dirs': [ 660 'include_dirs': [
661 '..', 661 '..',
662 ], 662 ],
663 }, 663 },
664 { 664 {
665 'target_name': 'worker',
666 'type': '<(library)',
667 'msvs_guid': 'C78D02D0-A366-4EC6-A248-AA8E64C4BA18',
668 'dependencies': [
669 '../base/base.gyp:base',
670 '../skia/skia.gyp:skia',
671 '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
672 ],
673 'sources': [
674 'worker/websharedworker_stub.cc',
675 'worker/websharedworker_stub.h',
676 'worker/webworker_stub_base.cc',
677 'worker/webworker_stub_base.h',
678 'worker/webworker_stub.cc',
679 'worker/webworker_stub.h',
680 'worker/webworkerclient_proxy.cc',
681 'worker/webworkerclient_proxy.h',
682 'worker/worker_main.cc',
683 'worker/worker_thread.cc',
684 'worker/worker_thread.h',
685 'worker/worker_webapplicationcachehost_impl.cc',
686 'worker/worker_webapplicationcachehost_impl.h',
687 'worker/worker_webkitclient_impl.cc',
688 'worker/worker_webkitclient_impl.h',
689 ],
690 'include_dirs': [
691 '..',
692 ],
693 },
694 {
695 # Provides a syncapi dynamic library target from checked-in binaries, 665 # Provides a syncapi dynamic library target from checked-in binaries,
696 # or from compiling a stub implementation. 666 # or from compiling a stub implementation.
697 'target_name': 'syncapi', 667 'target_name': 'syncapi',
698 'type': '<(library)', 668 'type': '<(library)',
699 'sources': [ 669 'sources': [
700 'browser/sync/engine/syncapi.cc', 670 'browser/sync/engine/syncapi.cc',
701 ], 671 ],
702 'include_dirs': [ 672 'include_dirs': [
703 '..', 673 '..',
704 '<(protoc_out_dir)', 674 '<(protoc_out_dir)',
(...skipping 1090 matching lines...) Expand 10 before | Expand all | Expand 10 after
1795 }], # targets 1765 }], # targets
1796 }], # OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" 1766 }], # OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"
1797 ], # 'conditions' 1767 ], # 'conditions'
1798 } 1768 }
1799 1769
1800 # Local Variables: 1770 # Local Variables:
1801 # tab-width:2 1771 # tab-width:2
1802 # indent-tabs-mode:nil 1772 # indent-tabs-mode:nil
1803 # End: 1773 # End:
1804 # vim: set expandtab tabstop=2 shiftwidth=2: 1774 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « no previous file | chrome/chrome_dll.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698