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

Unified Diff: content/content_shell.gypi

Issue 28123002: Introduce a separate gyp file for content shell and tests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: updates Created 7 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/content.gyp ('k') | content/content_shell_and_tests.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/content_shell.gypi
diff --git a/content/content_shell.gypi b/content/content_shell.gypi
index efd102fbf24c18dd5a9e7b0c44ed81db696c167b..6c0f624845dc7d6039d38308af48d33407fa1150 100644
--- a/content/content_shell.gypi
+++ b/content/content_shell.gypi
@@ -21,22 +21,21 @@
{
'target_name': 'content_shell_lib',
'type': 'static_library',
- 'defines!': ['CONTENT_IMPLEMENTATION'],
'defines': ['CONTENT_SHELL_VERSION="<(content_shell_version)"'],
'variables': {
'chromium_code': 1,
},
'dependencies': [
- 'content_app_both',
- 'content_browser',
- 'content_common',
- 'content_gpu',
- 'content_plugin',
- 'content_ppapi_plugin',
- 'content_renderer',
+ 'content.gyp:content_app_both',
+ '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_shell_resources',
- 'content_utility',
- 'content_worker',
'test_support_content',
'content_resources.gyp:content_resources',
'../base/base.gyp:base',
@@ -355,7 +354,6 @@
'target_name': 'content_shell',
'type': 'executable',
'mac_bundle': 1,
- 'defines!': ['CONTENT_IMPLEMENTATION'],
'variables': {
'chromium_code': 1,
},
@@ -694,7 +692,7 @@
'target_name': 'content_shell_java',
'type': 'none',
'dependencies': [
- 'content_java',
+ 'content.gyp:content_java',
],
'variables': {
'java_in_dir': '../content/shell/android/java',
@@ -721,7 +719,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',
« no previous file with comments | « content/content.gyp ('k') | content/content_shell_and_tests.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698