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 /android_webview/android_webview_tests.gypi | |
| 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 'android_webview/android_webview_tests.gypi')
| -rw-r--r-- | android_webview/android_webview_tests.gypi | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/android_webview/android_webview_tests.gypi b/android_webview/android_webview_tests.gypi index e416559..bb9cc0f 100644 --- a/android_webview/android_webview_tests.gypi +++ b/android_webview/android_webview_tests.gypi @@ -51,7 +51,7 @@ 'type': 'none', 'dependencies': [ '../base/base.gyp:base_java_test_support', - '../content/content_shell_and_tests.gyp:content_java_test_support', + '../content/content.gyp:content_java_test_support', '../net/net.gyp:net_java_test_support', 'android_webview_apk_java', ], @@ -67,7 +67,7 @@ 'type': '<(gtest_target_type)', 'dependencies': [ '../base/base.gyp:test_support_base', - '../content/content_shell_and_tests.gyp:test_support_content', + '../content/content.gyp:test_support_content', '../net/net.gyp:net_test_support', '../testing/android/native_test.gyp:native_test_native_code', '../testing/gmock.gyp:gmock', @@ -94,7 +94,7 @@ 'type': 'none', 'dependencies': [ '../base/base.gyp:base_java_test_support', - '../content/content_shell_and_tests.gyp:content_java_test_support', + '../content/content.gyp:content_java_test_support', 'android_webview_java', ], 'variables': { |