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

Unified Diff: content/content.gyp

Issue 17619005: Create top-level separate targets for browser and child dlls (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: android Created 7 years, 5 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/browser/renderer_host/render_process_host_impl.cc ('k') | content/content_common.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/content.gyp
diff --git a/content/content.gyp b/content/content.gyp
index 4def8b2d161293bf7b6cacb395e48742852d747d..f938e36f3ce16505468280ee1869aad2aa77699a 100644
--- a/content/content.gyp
+++ b/content/content.gyp
@@ -52,7 +52,7 @@
'content_common',
],
'conditions': [
- ['OS != "ios" and chrome_split_dll != 1', {
+ ['OS != "ios"', {
'dependencies': [
'content_gpu',
'content_plugin',
@@ -74,6 +74,31 @@
'dependencies': [
'content_common',
],
+ 'conditions': [
+ ['chrome_multiple_dll', {
+ 'defines': [
+ 'CHROME_MULTIPLE_DLL_BROWSER',
+ ],
+ }],
+ ],
+ },
+ {
+ 'target_name': 'content_app_child',
+ 'type': 'static_library',
+ 'variables': { 'enable_wexit_time_destructors': 1, },
+ 'includes': [
+ 'content_app.gypi',
+ ],
+ 'dependencies': [
+ 'content_common',
+ ],
+ 'conditions': [
+ ['chrome_multiple_dll', {
+ 'defines': [
+ 'CHROME_MULTIPLE_DLL_CHILD',
+ ],
+ }],
+ ],
},
{
'target_name': 'content_browser',
@@ -87,18 +112,12 @@
'content_resources.gyp:content_resources',
],
'conditions': [
- ['OS != "ios" and chrome_split_dll != 1', {
+ ['OS != "ios"', {
'dependencies': [
'content_gpu',
- 'content_renderer',
'content_utility',
],
}],
- ['chrome_split_dll', {
- 'dependencies': [
- 'content_gpu',
- ],
- }],
['java_bridge==1', {
'dependencies': [
'content_child',
@@ -274,6 +293,11 @@
'dependencies': ['content', 'content_browser'],
},
{
+ 'target_name': 'content_app_child',
+ 'type': 'none',
+ 'dependencies': ['content', 'content_child'],
+ },
+ {
'target_name': 'content_browser',
'type': 'none',
'dependencies': ['content'],
« no previous file with comments | « content/browser/renderer_host/render_process_host_impl.cc ('k') | content/content_common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698