diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-02 20:47:45 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-02 20:47:45 +0000 |
| commit | 73a7597744378d253c0082921b344cc396a671f5 (patch) | |
| tree | 719e76b978dc184cefb4bd2b4a7c8479ea0b7a61 /content/content.gyp | |
| parent | 86e95b2825d1d0e1b3d36ebb0ae65f160fe34d81 (diff) | |
| download | chromium_src-73a7597744378d253c0082921b344cc396a671f5.zip chromium_src-73a7597744378d253c0082921b344cc396a671f5.tar.gz chromium_src-73a7597744378d253c0082921b344cc396a671f5.tar.bz2 | |
Revert 209420 "Factor out content shell and tests into a standal..."
> Factor out content shell and tests into a standalone gyp
>
> This simplifies using components in Content Shell. As components can
> depend on the content layer, trying to use a component from Content Shell
> results in a cross-reference of gyp files which isn't allowed on Mac.
>
> TBR=joi,robertshield (trivial one-line renames in gyp files)
>
> Review URL: https://chromiumcodereview.appspot.com/17366006
TBR=mnaganov@chromium.org
Review URL: https://codereview.chromium.org/18547009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@209770 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/content.gyp')
| -rw-r--r-- | content/content.gyp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/content/content.gyp b/content/content.gyp index 7fe5ac4..68a6f40 100644 --- a/content/content.gyp +++ b/content/content.gyp @@ -21,10 +21,14 @@ }], ], }, + 'includes': [ + 'content_tests.gypi', + ], 'conditions': [ ['OS != "ios"', { 'includes': [ '../build/win_precompile.gypi', + 'content_shell.gypi', ], }], # In component mode, we build all of content as a single DLL. |