summaryrefslogtreecommitdiffstats
path: root/chrome_frame
diff options
context:
space:
mode:
authorscottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-06 02:51:15 +0000
committerscottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-06 02:51:15 +0000
commitc955a8d2084220f245f6ef5e78baef677691b23a (patch)
treeda95605b9c91145bfd149d6039e99daa4954405a /chrome_frame
parented4d58055596873743318eaa713560dec2418573 (diff)
downloadchromium_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_frame')
-rw-r--r--chrome_frame/chrome_frame.gyp2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome_frame/chrome_frame.gyp b/chrome_frame/chrome_frame.gyp
index 4225df5..b495cc0 100644
--- a/chrome_frame/chrome_frame.gyp
+++ b/chrome_frame/chrome_frame.gyp
@@ -412,7 +412,7 @@
'../chrome/chrome.gyp:renderer',
'../chrome/chrome.gyp:test_support_common',
'../chrome/chrome_resources.gyp:chrome_resources',
- '../content/content.gyp:content_app',
+ '../content/content.gyp:content_app_browser',
'../content/content.gyp:content_gpu',
'../content/content.gyp:test_support_content',
'../net/net.gyp:net',