mozilla
/
chromium-src-build
зеркало из https://github.com/mozilla/chromium-src-build.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

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: http://src.chromium.org/svn/trunk/src/build@209770 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
This commit is contained in:
jam@chromium.org 2013-07-02 20:47:45 +00:00
Родитель fa0da706d6
Коммит 0be8eb7fc0
2 изменённых файлов: 29 добавлений и 29 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

42
all.gyp
Просмотреть файл

@ -224,9 +224,9 @@
'../chrome/chrome.gyp:sync_integration_tests',
'../cloud_print/cloud_print.gyp:cloud_print_unittests',
'../components/components.gyp:components_unittests',
'../content/content_shell_and_tests.gyp:content_browsertests',
'../content/content_shell_and_tests.gyp:content_unittests',
'../content/content_shell_and_tests.gyp:content_shell',
'../content/content.gyp:content_browsertests',
'../content/content.gyp:content_shell',
'../content/content.gyp:content_unittests',
'../device/device.gyp:device_unittests',
'../gpu/gpu.gyp:gpu_unittests',
'../gpu/gles2_conform_support/gles2_conform_support.gyp:gles2_conform_support',
@ -322,7 +322,7 @@
'type': 'none',
'dependencies': [
'../third_party/WebKit/public/all.gyp:all_blink',
'../content/content_shell_and_tests.gyp:content_shell',
'../content/content.gyp:content_shell',
],
}, # target_name: all_webkit
{
@ -351,8 +351,8 @@
'../chrome/chrome.gyp:gpu_tests',
'../chrome/chrome.gyp:performance_browser_tests',
'../chrome/chrome.gyp:performance_ui_tests',
'../content/content_shell_and_tests.gyp:content_browsertests',
'../content/content_shell_and_tests.gyp:content_gl_tests',
'../content/content.gyp:content_browsertests',
'../content/content.gyp:content_gl_tests',
'../gpu/gpu.gyp:gl_tests',
],
'conditions': [
@ -368,8 +368,8 @@
'type': 'none',
'dependencies': [
'../chrome/chrome.gyp:gpu_tests',
'../content/content_shell_and_tests.gyp:content_browsertests',
'../content/content_shell_and_tests.gyp:content_gl_tests',
'../content/content.gyp:content_browsertests',
'../content/content.gyp:content_gl_tests',
'../gpu/gpu.gyp:gl_tests',
],
'conditions': [
@ -435,8 +435,8 @@
'dependencies': [
'chromium_builder_qa', # needed for perf pyauto tests
'../chrome/chrome.gyp:browser_tests',
'../content/content_shell_and_tests.gyp:content_browsertests',
'../content/content_shell_and_tests.gyp:content_unittests',
'../content/content.gyp:content_browsertests',
'../content/content.gyp:content_unittests',
'../third_party/libjingle/libjingle.gyp:peerconnection_server',
'../third_party/webrtc/tools/tools.gyp:frame_analyzer',
'../third_party/webrtc/tools/tools.gyp:rgba_to_i420_converter',
@ -486,8 +486,8 @@
'../chrome/chrome.gyp:unit_tests',
'../cloud_print/cloud_print.gyp:cloud_print_unittests',
'../components/components.gyp:components_unittests',
'../content/content_shell_and_tests.gyp:content_browsertests',
'../content/content_shell_and_tests.gyp:content_unittests',
'../content/content.gyp:content_browsertests',
'../content/content.gyp:content_unittests',
'../device/device.gyp:device_unittests',
'../gpu/gpu.gyp:gpu_unittests',
'../ipc/ipc.gyp:ipc_tests',
@ -518,8 +518,8 @@
'../chrome/chrome.gyp:unit_tests',
'../cloud_print/cloud_print.gyp:cloud_print_unittests',
'../components/components.gyp:components_unittests',
'../content/content_shell_and_tests.gyp:content_browsertests',
'../content/content_shell_and_tests.gyp:content_unittests',
'../content/content.gyp:content_browsertests',
'../content/content.gyp:content_unittests',
'../device/device.gyp:device_unittests',
'../gpu/gpu.gyp:gpu_unittests',
'../ipc/ipc.gyp:ipc_tests',
@ -572,7 +572,7 @@
'../chrome/chrome.gyp:unit_tests',
'../cloud_print/cloud_print.gyp:cloud_print_unittests',
'../components/components.gyp:components_unittests',
'../content/content_shell_and_tests.gyp:content_unittests',
'../content/content.gyp:content_unittests',
'../crypto/crypto.gyp:crypto_unittests',
'../device/device.gyp:device_unittests',
'../ipc/ipc.gyp:ipc_tests',
@ -610,8 +610,8 @@
'../chrome/chrome.gyp:unit_tests',
'../cloud_print/cloud_print.gyp:cloud_print_unittests',
'../components/components.gyp:components_unittests',
'../content/content_shell_and_tests.gyp:content_browsertests',
'../content/content_shell_and_tests.gyp:content_unittests',
'../content/content.gyp:content_browsertests',
'../content/content.gyp:content_unittests',
# mini_installer_tests depends on mini_installer. This should be
# defined in installer.gyp.
'../chrome/installer/mini_installer.gyp:mini_installer',
@ -677,7 +677,7 @@
'../base/base.gyp:base_unittests',
'../cloud_print/cloud_print.gyp:cloud_print_unittests',
'../components/components.gyp:components_unittests',
'../content/content_shell_and_tests.gyp:content_unittests',
'../content/content.gyp:content_unittests',
'../crypto/crypto.gyp:crypto_unittests',
'../ipc/ipc.gyp:ipc_tests',
'../jingle/jingle.gyp:jingle_unittests',
@ -699,7 +699,7 @@
'../chrome/chrome.gyp:unit_tests',
'../cloud_print/cloud_print.gyp:cloud_print_unittests',
'../components/components.gyp:components_unittests',
'../content/content_shell_and_tests.gyp:content_unittests',
'../content/content.gyp:content_unittests',
'../crypto/crypto.gyp:crypto_unittests',
'../device/device.gyp:device_unittests',
'../ipc/ipc.gyp:ipc_tests',
@ -793,8 +793,8 @@
'../chrome/chrome.gyp:interactive_ui_tests',
'../chrome/chrome.gyp:unit_tests',
'../components/components.gyp:components_unittests',
'../content/content_shell_and_tests.gyp:content_browsertests',
'../content/content_shell_and_tests.gyp:content_unittests',
'../content/content.gyp:content_browsertests',
'../content/content.gyp:content_unittests',
'../device/device.gyp:device_unittests',
'../ppapi/ppapi_internal.gyp:ppapi_unittests',
'../remoting/remoting.gyp:remoting_unittests',

16
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',