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

Introduce a separate gyp file for content shell and tests 

This will make it possible to depend on components from content shell

BUG=247431
R=jam@chromium.org
TBR=ben@chromium.org

Review URL: https://codereview.chromium.org/28123002

git-svn-id: http://src.chromium.org/svn/trunk/src/build@229620 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
This commit is contained in:
jochen@chromium.org 2013-10-19 22:13:17 +00:00
Родитель e16a047f57
Коммит 094b0945e9
2 изменённых файлов: 34 добавлений и 34 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@ -232,9 +232,9 @@
'../chrome/chrome.gyp:sync_integration_tests',
'../cloud_print/cloud_print.gyp:cloud_print_unittests',
'../components/components.gyp:components_unittests',
'../content/content.gyp:content_browsertests',
'../content/content.gyp:content_shell',
'../content/content.gyp:content_unittests',
'../content/content_shell_and_tests.gyp:content_browsertests',
'../content/content_shell_and_tests.gyp:content_shell',
'../content/content_shell_and_tests.gyp:content_unittests',
'../device/device_tests.gyp:device_unittests',
'../google_apis/google_apis.gyp:google_apis_unittests',
'../gpu/gles2_conform_support/gles2_conform_support.gyp:gles2_conform_support',
@ -355,7 +355,7 @@
'type': 'none',
'dependencies': [
'../third_party/WebKit/public/all.gyp:all_blink',
'../content/content.gyp:content_shell',
'../content/content_shell_and_tests.gyp:content_shell',
],
}, # target_name: all_webkit
{
@ -397,8 +397,8 @@
'../chrome/chrome.gyp:chrome',
'../chrome/chrome.gyp:performance_browser_tests',
'../chrome/chrome.gyp:performance_ui_tests',
'../content/content.gyp:content_browsertests',
'../content/content.gyp:content_gl_tests',
'../content/content_shell_and_tests.gyp:content_browsertests',
'../content/content_shell_and_tests.gyp:content_gl_tests',
'../gpu/gpu.gyp:gl_tests',
],
'conditions': [
@ -424,8 +424,8 @@
'type': 'none',
'dependencies': [
'../chrome/chrome.gyp:chrome',
'../content/content.gyp:content_browsertests',
'../content/content.gyp:content_gl_tests',
'../content/content_shell_and_tests.gyp:content_browsertests',
'../content/content_shell_and_tests.gyp:content_gl_tests',
'../gpu/gpu.gyp:gl_tests',
],
'conditions': [
@ -501,8 +501,8 @@
'dependencies': [
'chromium_builder_qa', # needed for perf pyauto tests
'../chrome/chrome.gyp:browser_tests',
'../content/content.gyp:content_browsertests',
'../content/content.gyp:content_unittests',
'../content/content_shell_and_tests.gyp:content_browsertests',
'../content/content_shell_and_tests.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',
@ -532,19 +532,19 @@
# We refer to content_shell directly rather than all_webkit
# because we don't want the _unittests binaries.
'../content/content.gyp:content_shell',
'../content/content_shell_and_tests.gyp:content_shell',
],
'conditions': [
['OS!="win"', {
'dependencies': [
'../content/content.gyp:content_browsertests',
'../content/content_shell_and_tests.gyp:content_browsertests',
'../net/net.gyp:dns_fuzz_stub',
],
}],
['OS=="win" and fastbuild==0 and target_arch=="ia32"', {
'dependencies': [
'../chrome/chrome_syzygy.gyp:chrome_dll_syzygy',
'../content/content.gyp:content_shell_syzyasan',
'../content/content_shell_and_tests.gyp:content_shell_syzyasan',
],
'conditions': [
['chrome_multiple_dll==1', {
@ -583,8 +583,8 @@
'../chrome/chrome.gyp:unit_tests',
'../cloud_print/cloud_print.gyp:cloud_print_unittests',
'../components/components.gyp:components_unittests',
'../content/content.gyp:content_browsertests',
'../content/content.gyp:content_unittests',
'../content/content_shell_and_tests.gyp:content_browsertests',
'../content/content_shell_and_tests.gyp:content_unittests',
'../device/device_tests.gyp:device_unittests',
'../gpu/gpu.gyp:gpu_unittests',
'../ipc/ipc.gyp:ipc_tests',
@ -616,8 +616,8 @@
'../chrome/chrome.gyp:unit_tests',
'../cloud_print/cloud_print.gyp:cloud_print_unittests',
'../components/components.gyp:components_unittests',
'../content/content.gyp:content_browsertests',
'../content/content.gyp:content_unittests',
'../content/content_shell_and_tests.gyp:content_browsertests',
'../content/content_shell_and_tests.gyp:content_unittests',
'../device/device_tests.gyp:device_unittests',
'../gpu/gpu.gyp:gpu_unittests',
'../ipc/ipc.gyp:ipc_tests',
@ -670,7 +670,7 @@
'../chrome/chrome.gyp:unit_tests',
'../cloud_print/cloud_print.gyp:cloud_print_unittests',
'../components/components.gyp:components_unittests',
'../content/content.gyp:content_unittests',
'../content/content_shell_and_tests.gyp:content_unittests',
'../crypto/crypto.gyp:crypto_unittests',
'../device/device_tests.gyp:device_unittests',
'../ipc/ipc.gyp:ipc_tests',
@ -709,8 +709,8 @@
'../chrome/chrome.gyp:unit_tests',
'../cloud_print/cloud_print.gyp:cloud_print_unittests',
'../components/components.gyp:components_unittests',
'../content/content.gyp:content_browsertests',
'../content/content.gyp:content_unittests',
'../content/content_shell_and_tests.gyp:content_browsertests',
'../content/content_shell_and_tests.gyp:content_unittests',
# mini_installer_tests depends on mini_installer. This should be
# defined in installer.gyp.
'../chrome/installer/mini_installer.gyp:mini_installer',
@ -777,7 +777,7 @@
'../base/base.gyp:base_unittests',
'../cloud_print/cloud_print.gyp:cloud_print_unittests',
'../components/components.gyp:components_unittests',
'../content/content.gyp:content_unittests',
'../content/content_shell_and_tests.gyp:content_unittests',
'../crypto/crypto.gyp:crypto_unittests',
'../ipc/ipc.gyp:ipc_tests',
'../jingle/jingle.gyp:jingle_unittests',
@ -800,7 +800,7 @@
'../chrome/chrome.gyp:browser_tests',
'../cloud_print/cloud_print.gyp:cloud_print_unittests',
'../components/components.gyp:components_unittests',
'../content/content.gyp:content_unittests',
'../content/content_shell_and_tests.gyp:content_unittests',
'../crypto/crypto.gyp:crypto_unittests',
'../device/device_tests.gyp:device_unittests',
'../ipc/ipc.gyp:ipc_tests',
@ -890,8 +890,8 @@
'../chrome/chrome.gyp:interactive_ui_tests',
'../chrome/chrome.gyp:unit_tests',
'../components/components.gyp:components_unittests',
'../content/content.gyp:content_browsertests',
'../content/content.gyp:content_unittests',
'../content/content_shell_and_tests.gyp:content_browsertests',
'../content/content_shell_and_tests.gyp:content_unittests',
'../device/device_tests.gyp:device_unittests',
'../ppapi/ppapi_internal.gyp:ppapi_unittests',
'../remoting/remoting.gyp:remoting_unittests',

20
all_android.gyp
Просмотреть файл

@ -17,7 +17,7 @@
'target_name': 'All',
'type': 'none',
'dependencies': [
'../content/content.gyp:content_shell_apk',
'../content/content_shell_and_tests.gyp:content_shell_apk',
'<@(android_app_targets)',
'android_builder_tests',
'../android_webview/android_webview.gyp:android_webview_apk',
@ -34,7 +34,7 @@
'type': 'none',
'dependencies': [
'../third_party/WebKit/public/all.gyp:all_blink',
'../content/content.gyp:content_shell_apk',
'../content/content_shell_and_tests.gyp:content_shell_apk',
],
}, # target_name: all_webkit
{
@ -64,10 +64,10 @@
'../cc/cc_tests.gyp:cc_unittests',
'../chrome/chrome.gyp:unit_tests',
'../components/components.gyp:components_unittests',
'../content/content.gyp:content_browsertests',
'../content/content.gyp:content_gl_tests',
'../content/content.gyp:content_shell_test_apk',
'../content/content.gyp:content_unittests',
'../content/content_shell_and_tests.gyp:content_browsertests',
'../content/content_shell_and_tests.gyp:content_gl_tests',
'../content/content_shell_and_tests.gyp:content_shell_test_apk',
'../content/content_shell_and_tests.gyp:content_unittests',
'../gpu/gpu.gyp:gl_tests',
'../gpu/gpu.gyp:gpu_unittests',
'../ipc/ipc.gyp:ipc_tests',
@ -96,10 +96,10 @@
'../cc/cc_tests.gyp:cc_unittests_apk',
'../chrome/chrome.gyp:unit_tests_apk',
'../components/components.gyp:components_unittests_apk',
'../content/content.gyp:content_browsertests_apk',
'../content/content.gyp:content_gl_tests_apk',
'../content/content.gyp:content_unittests_apk',
'../content/content.gyp:video_decode_accelerator_unittest_apk',
'../content/content_shell_and_tests.gyp:content_browsertests_apk',
'../content/content_shell_and_tests.gyp:content_gl_tests_apk',
'../content/content_shell_and_tests.gyp:content_unittests_apk',
'../content/content_shell_and_tests.gyp:video_decode_accelerator_unittest_apk',
'../gpu/gpu.gyp:gl_tests_apk',
'../gpu/gpu.gyp:gpu_unittests_apk',
'../ipc/ipc.gyp:ipc_tests_apk',