diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-25 01:51:16 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-25 01:51:16 +0000 |
| commit | ef23cdd535353ea3749ffd92d32bfbe68420b56b (patch) | |
| tree | 8235a42e056d1ec622867e777d0853d77d9d977e | |
| parent | bb07ab07ab242f31c549f6b30310eade0754bd8e (diff) | |
| download | chromium_src-ef23cdd535353ea3749ffd92d32bfbe68420b56b.zip chromium_src-ef23cdd535353ea3749ffd92d32bfbe68420b56b.tar.gz chromium_src-ef23cdd535353ea3749ffd92d32bfbe68420b56b.tar.bz2 | |
Revert 98164 since there are missing dependencies on linux views build - Move resource_dispatcher_host_unittest.cc to content_unittests now that all its link time dependencies are in content.
BUG=90443
Review URL: http://codereview.chromium.org/7746008
TBR=jam@chromium.org
Review URL: http://codereview.chromium.org/7743007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98166 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/chrome_browser.gypi | 8 | ||||
| -rw-r--r-- | chrome/chrome_tests.gypi | 1 | ||||
| -rw-r--r-- | content/content_browser.gypi | 8 | ||||
| -rw-r--r-- | content/content_tests.gypi | 1 |
4 files changed, 9 insertions, 9 deletions
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index e4454bf..5e8829d 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -4182,6 +4182,14 @@ '../views/views.gyp:views', '../views/views.gyp:views_desktop_lib', ], + 'direct_dependent_settings': { + 'link_settings': { + 'libraries': [ + '-llocationapi.lib', + '-lsensorsapi.lib', + ], + } + }, 'sources': [ 'browser/first_run/upgrade_util.cc', 'browser/first_run/upgrade_util.h', diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index c21d375..71d677f 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -2021,6 +2021,7 @@ '../content/browser/plugin_service_unittest.cc', '../content/browser/renderer_host/render_view_host_unittest.cc', '../content/browser/renderer_host/render_widget_host_unittest.cc', + '../content/browser/renderer_host/resource_dispatcher_host_unittest.cc', '../content/browser/site_instance_unittest.cc', '../content/browser/tab_contents/navigation_controller_unittest.cc', '../content/browser/tab_contents/navigation_entry_unittest.cc', diff --git a/content/content_browser.gypi b/content/content_browser.gypi index d2240fd..a78751a 100644 --- a/content/content_browser.gypi +++ b/content/content_browser.gypi @@ -544,14 +544,6 @@ '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2', '../third_party/isimpledom/isimpledom.gyp:isimpledom', ], - 'direct_dependent_settings': { - 'link_settings': { - 'libraries': [ - '-llocationapi.lib', - '-lsensorsapi.lib', - ], - } - }, 'sources!': [ 'browser/power_save_blocker_stub.cc', ], diff --git a/content/content_tests.gypi b/content/content_tests.gypi index 817cf28..f1124aa 100644 --- a/content/content_tests.gypi +++ b/content/content_tests.gypi @@ -90,7 +90,6 @@ 'browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc', 'browser/renderer_host/media/video_capture_host_unittest.cc', 'browser/renderer_host/media/video_capture_manager_unittest.cc', - 'browser/renderer_host/resource_dispatcher_host_unittest.cc', 'browser/renderer_host/resource_queue_unittest.cc', 'browser/resolve_proxy_msg_helper_unittest.cc', 'browser/speech/endpointer/endpointer_unittest.cc', |