summaryrefslogtreecommitdiffstats
path: root/components
diff options
context:
space:
mode:
authormnaganov@chromium.org <mnaganov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-01 13:38:41 +0000
committermnaganov@chromium.org <mnaganov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-01 13:38:41 +0000
commita20f6e8ec107dd2249e3da5263ba1de4265036f2 (patch)
treefaa0fe048ad3ae9f194e3cf4f5bc79692e055cbe /components
parent9b48510b3ebc70aeb0dcc477a57eb2bf1d8f9753 (diff)
downloadchromium_src-a20f6e8ec107dd2249e3da5263ba1de4265036f2.zip
chromium_src-a20f6e8ec107dd2249e3da5263ba1de4265036f2.tar.gz
chromium_src-a20f6e8ec107dd2249e3da5263ba1de4265036f2.tar.bz2
Factor out content shell and tests into a standalone gyp
This simplifies using components in Content Shell. As components can depend on the content layer, trying to use a component from Content Shell results in a cross-reference of gyp files which isn't allowed on Mac. TBR=joi,robertshield (trivial one-line renames in gyp files) Review URL: https://chromiumcodereview.appspot.com/17366006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@209420 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'components')
-rw-r--r--components/components_tests.gypi4
1 files changed, 2 insertions, 2 deletions
diff --git a/components/components_tests.gypi b/components/components_tests.gypi
index 4325216..558b2a9 100644
--- a/components/components_tests.gypi
+++ b/components/components_tests.gypi
@@ -43,7 +43,7 @@
'encryptor',
# Dependencies of intercept_navigation_resource_throttle_unittest.cc
- '../content/content.gyp:test_support_content',
+ '../content/content_shell_and_tests.gyp:test_support_content',
'../skia/skia.gyp:skia',
'navigation_interception',
@@ -93,7 +93,7 @@
'dependencies': [
'../base/base.gyp:base',
'../base/base.gyp:test_support_perf',
- '../content/content.gyp:test_support_content',
+ '../content/content_shell_and_tests.gyp:test_support_content',
'../testing/gtest.gyp:gtest',
'../ui/compositor/compositor.gyp:compositor',
'visitedlink_browser',