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 /ash | |
| 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 'ash')
| -rw-r--r-- | ash/ash.gyp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ash/ash.gyp b/ash/ash.gyp index ddce2fc..6e826a3 100644 --- a/ash/ash.gyp +++ b/ash/ash.gyp @@ -626,7 +626,7 @@ '../base/base.gyp:test_support_base', '../chrome/chrome_resources.gyp:packed_resources', '../content/content.gyp:content_browser', - '../content/content_shell_and_tests.gyp:test_support_content', + '../content/content.gyp:test_support_content', '../skia/skia.gyp:skia', '../testing/gtest.gyp:gtest', '../third_party/icu/icu.gyp:icui18n', @@ -808,8 +808,8 @@ '../base/base.gyp:base', '../base/base.gyp:base_i18n', '../chrome/chrome_resources.gyp:packed_resources', + '../content/content.gyp:content_shell_lib', '../content/content.gyp:content', - '../content/content_shell_and_tests.gyp:content_shell_lib', '../skia/skia.gyp:skia', '../third_party/icu/icu.gyp:icui18n', '../third_party/icu/icu.gyp:icuuc', |