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 /chrome/chrome_tests_unit.gypi | |
| 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 'chrome/chrome_tests_unit.gypi')
| -rw-r--r-- | chrome/chrome_tests_unit.gypi | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi index a25e968..005ddfd 100644 --- a/chrome/chrome_tests_unit.gypi +++ b/chrome/chrome_tests_unit.gypi @@ -20,7 +20,7 @@ '../base/base.gyp:test_support_base', '../base/base.gyp:base_prefs_test_support', '../components/components.gyp:sessions_test_support', - '../content/content.gyp:content_app', + '../content/content.gyp:content_app_both', '../content/content.gyp:test_support_content', '../media/media.gyp:media_test_support', '../net/net.gyp:net', @@ -438,6 +438,7 @@ '<@(chromium_child_dependencies)', # 2) test-specific support libraries: '../base/base.gyp:test_support_base', + '../content/content.gyp:content_app_both', '../media/media.gyp:media_test_support', '../net/net.gyp:net', '../net/net.gyp:net_test_support', @@ -2591,6 +2592,7 @@ # 1) everything that the chrome binaries depend on: '<@(chromium_browser_dependencies)', '<@(chromium_child_dependencies)', + '../content/content.gyp:content_app_both', # 2) test-specific support libraries: '../testing/gmock.gyp:gmock', '../testing/gtest.gyp:gtest', |