summaryrefslogtreecommitdiffstats
path: root/content/content_shell.gypi
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 /content/content_shell.gypi
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 'content/content_shell.gypi')
-rw-r--r--content/content_shell.gypi24
1 files changed, 12 insertions, 12 deletions
diff --git a/content/content_shell.gypi b/content/content_shell.gypi
index ef34e02..23806f8 100644
--- a/content/content_shell.gypi
+++ b/content/content_shell.gypi
@@ -27,18 +27,18 @@
'chromium_code': 1,
},
'dependencies': [
- 'content_app',
- 'content_browser',
- 'content_common',
- 'content_gpu',
- 'content_plugin',
- 'content_ppapi_plugin',
- 'content_renderer',
+ 'content.gyp:content_app',
+ 'content.gyp:content_browser',
+ 'content.gyp:content_common',
+ 'content.gyp:content_gpu',
+ 'content.gyp:content_plugin',
+ 'content.gyp:content_ppapi_plugin',
+ 'content.gyp:content_renderer',
+ 'content.gyp:content_utility',
+ 'content.gyp:content_worker',
+ 'content_resources.gyp:content_resources',
'content_shell_resources',
- 'content_utility',
- 'content_worker',
'test_support_content',
- 'content_resources.gyp:content_resources',
'../base/base.gyp:base',
'../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
'../ipc/ipc.gyp:ipc',
@@ -662,7 +662,7 @@
'target_name': 'content_shell_java',
'type': 'none',
'dependencies': [
- 'content_java',
+ 'content.gyp:content_java',
],
'variables': {
'java_in_dir': '../content/shell/android/java',
@@ -689,7 +689,7 @@
'target_name': 'content_shell_apk',
'type': 'none',
'dependencies': [
- 'content_java',
+ 'content.gyp:content_java',
'content_java_test_support',
'content_shell_java',
'libcontent_shell_content_view',