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 /build/all_android.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 'build/all_android.gyp')
| -rw-r--r-- | build/all_android.gyp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/build/all_android.gyp b/build/all_android.gyp index 0796b13..79bbcdd 100644 --- a/build/all_android.gyp +++ b/build/all_android.gyp @@ -17,7 +17,7 @@ 'target_name': 'All', 'type': 'none', 'dependencies': [ - '../content/content_shell_and_tests.gyp:content_shell_apk', + '../content/content.gyp:content_shell_apk', '<@(android_app_targets)', 'android_builder_tests', '../android_webview/android_webview.gyp:android_webview_apk', @@ -33,7 +33,7 @@ 'type': 'none', 'dependencies': [ '../third_party/WebKit/public/all.gyp:all_blink', - '../content/content_shell_and_tests.gyp:content_shell_apk', + '../content/content.gyp:content_shell_apk', ], }, # target_name: all_webkit { @@ -56,9 +56,9 @@ '../cc/cc_tests.gyp:cc_unittests', '../chrome/chrome.gyp:unit_tests', '../components/components.gyp:components_unittests', - '../content/content_shell_and_tests.gyp:content_shell_test_apk', - '../content/content_shell_and_tests.gyp:content_unittests', - '../content/content_shell_and_tests.gyp:content_browsertests', + '../content/content.gyp:content_browsertests', + '../content/content.gyp:content_shell_test_apk', + '../content/content.gyp:content_unittests', '../gpu/gpu.gyp:gl_tests', '../gpu/gpu.gyp:gpu_unittests', '../ipc/ipc.gyp:ipc_tests', @@ -98,9 +98,9 @@ '../cc/cc_tests.gyp:cc_unittests_apk', '../chrome/chrome.gyp:unit_tests_apk', '../components/components.gyp:components_unittests_apk', - '../content/content_shell_and_tests.gyp:content_browsertests_apk', - '../content/content_shell_and_tests.gyp:content_unittests_apk', - '../content/content_shell_and_tests.gyp:video_decode_accelerator_unittest_apk', + '../content/content.gyp:content_browsertests_apk', + '../content/content.gyp:content_unittests_apk', + '../content/content.gyp:video_decode_accelerator_unittest_apk', '../gpu/gpu.gyp:gl_tests_apk', '../gpu/gpu.gyp:gpu_unittests_apk', '../ipc/ipc.gyp:ipc_tests_apk', |