Index: chrome/chrome.gyp |
=================================================================== |
--- chrome/chrome.gyp (revision 78005) |
+++ chrome/chrome.gyp (working copy) |
@@ -28,9 +28,9 @@ |
'renderer', |
'syncapi', |
'utility', |
- 'worker', |
'service', |
'../content/content.gyp:content_gpu', |
+ '../content/content.gyp:content_worker', |
'../printing/printing.gyp:printing', |
'../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:inspector_resources', |
], |
@@ -662,36 +662,6 @@ |
], |
}, |
{ |
- 'target_name': 'worker', |
- 'type': '<(library)', |
- 'msvs_guid': 'C78D02D0-A366-4EC6-A248-AA8E64C4BA18', |
- 'dependencies': [ |
- '../base/base.gyp:base', |
- '../skia/skia.gyp:skia', |
- '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit', |
- ], |
- 'sources': [ |
- 'worker/websharedworker_stub.cc', |
- 'worker/websharedworker_stub.h', |
- 'worker/webworker_stub_base.cc', |
- 'worker/webworker_stub_base.h', |
- 'worker/webworker_stub.cc', |
- 'worker/webworker_stub.h', |
- 'worker/webworkerclient_proxy.cc', |
- 'worker/webworkerclient_proxy.h', |
- 'worker/worker_main.cc', |
- 'worker/worker_thread.cc', |
- 'worker/worker_thread.h', |
- 'worker/worker_webapplicationcachehost_impl.cc', |
- 'worker/worker_webapplicationcachehost_impl.h', |
- 'worker/worker_webkitclient_impl.cc', |
- 'worker/worker_webkitclient_impl.h', |
- ], |
- 'include_dirs': [ |
- '..', |
- ], |
- }, |
- { |
# Provides a syncapi dynamic library target from checked-in binaries, |
# or from compiling a stub implementation. |
'target_name': 'syncapi', |