diff options
| author | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-06 02:51:15 +0000 |
|---|---|---|
| committer | scottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-06 02:51:15 +0000 |
| commit | c955a8d2084220f245f6ef5e78baef677691b23a (patch) | |
| tree | da95605b9c91145bfd149d6039e99daa4954405a /content/content.gyp | |
| parent | ed4d58055596873743318eaa713560dec2418573 (diff) | |
| download | chromium_src-c955a8d2084220f245f6ef5e78baef677691b23a.zip chromium_src-c955a8d2084220f245f6ef5e78baef677691b23a.tar.gz chromium_src-c955a8d2084220f245f6ef5e78baef677691b23a.tar.bz2 | |
Fix content_browsertests and other full stack tests in multiple_dll
Tests need both sets of entry point functions, ContentClient embedder
pointers, etc. Now in gyp, the three targets are content_app_browser for
browser-only, content_app_child, which is child-only, and
content_app_both which contains both.
TBR=joth@chromium.org, grt@chromium.org
R=jam@chromium.org
BUG=237249
Review URL: https://chromiumcodereview.appspot.com/21453003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@215771 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/content.gyp')
| -rw-r--r-- | content/content.gyp | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/content/content.gyp b/content/content.gyp index 4234a03..0305664 100644 --- a/content/content.gyp +++ b/content/content.gyp @@ -46,7 +46,7 @@ 'target_name': 'content', 'type': 'none', 'dependencies': [ - 'content_app', + 'content_app_browser', 'content_browser', 'content_child', 'content_common', @@ -65,7 +65,7 @@ ], }, { - 'target_name': 'content_app', + 'target_name': 'content_app_browser', 'type': 'static_library', 'variables': { 'enable_wexit_time_destructors': 1, }, 'includes': [ @@ -101,6 +101,17 @@ ], }, { + 'target_name': 'content_app_both', + 'type': 'static_library', + 'variables': { 'enable_wexit_time_destructors': 1, }, + 'includes': [ + 'content_app.gypi', + ], + 'dependencies': [ + 'content_common', + ], + }, + { 'target_name': 'content_browser', 'type': 'static_library', 'variables': { 'enable_wexit_time_destructors': 1, }, @@ -290,7 +301,7 @@ }, }, { - 'target_name': 'content_app', + 'target_name': 'content_app_browser', 'type': 'none', 'dependencies': ['content', 'content_browser'], }, @@ -300,6 +311,11 @@ 'dependencies': ['content', 'content_child'], }, { + 'target_name': 'content_app_both', + 'type': 'none', + 'dependencies': ['content'], + }, + { 'target_name': 'content_browser', 'type': 'none', 'dependencies': ['content'], |