diff options
| -rw-r--r-- | android_webview/android_webview_tests.gypi | 6 | ||||
| -rw-r--r-- | ash/ash.gyp | 4 | ||||
| -rw-r--r-- | build/all.gyp | 42 | ||||
| -rw-r--r-- | build/all_android.gyp | 16 | ||||
| -rw-r--r-- | chrome/chrome.gyp | 6 | ||||
| -rw-r--r-- | chrome/chrome_tests.gypi | 6 | ||||
| -rw-r--r-- | chrome/chrome_tests_unit.gypi | 2 | ||||
| -rw-r--r-- | chrome_frame/chrome_frame.gyp | 2 | ||||
| -rw-r--r-- | components/components_tests.gypi | 4 | ||||
| -rw-r--r-- | content/OWNERS | 1 | ||||
| -rw-r--r-- | content/content.gyp | 4 | ||||
| -rw-r--r-- | content/content_shell.gypi | 24 | ||||
| -rw-r--r-- | content/content_shell_and_tests.gyp | 19 | ||||
| -rw-r--r-- | content/content_tests.gypi | 54 | ||||
| -rw-r--r-- | ui/views/views.gyp | 6 |
15 files changed, 90 insertions, 106 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': { 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', diff --git a/build/all.gyp b/build/all.gyp index ca3bf99..d92d577 100644 --- a/build/all.gyp +++ b/build/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', 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', diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 2783f9f..c9109ce 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -904,9 +904,9 @@ '../base/base.gyp:base_unittests', '../chrome_frame/chrome_frame.gyp:chrome_frame_tests', '../chrome_frame/chrome_frame.gyp:chrome_frame_net_tests', - '../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', '../net/net.gyp:net_unittests', '../ui/ui.gyp:ui_unittests', ], diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index b988ecb..80abf34 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -2821,7 +2821,7 @@ 'common', 'renderer', '../content/content.gyp:content_gpu', - '../content/content_shell_and_tests.gyp:test_support_content', + '../content/content.gyp:test_support_content', '../base/base.gyp:base', '../base/base.gyp:test_support_base', '../base/base.gyp:test_support_perf', @@ -3163,7 +3163,7 @@ 'interactive_ui_tests', # Disabled from running in coverage_posix.py. # We need to build this during compile step, so enabling here. - '../content/content_shell_and_tests.gyp:content_browsertests', + '../content/content.gyp:content_browsertests', '../courgette/courgette.gyp:courgette_unittests', '../crypto/crypto.gyp:crypto_unittests', '../jingle/jingle.gyp:jingle_unittests', @@ -3273,7 +3273,7 @@ 'chromium_testshell_java', '../base/base.gyp:base', '../base/base.gyp:base_java_test_support', - '../content/content_shell_and_tests.gyp:content_java_test_support', + '../content/content.gyp:content_java_test_support', '../sync/sync.gyp:sync_javatests', '../tools/android/forwarder/forwarder.gyp:forwarder', ], diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi index cf9fa34..17fd756 100644 --- a/chrome/chrome_tests_unit.gypi +++ b/chrome/chrome_tests_unit.gypi @@ -21,7 +21,7 @@ '../base/base.gyp:base_prefs_test_support', '../components/components.gyp:sessions_test_support', '../content/content.gyp:content_app', - '../content/content_shell_and_tests.gyp:test_support_content', + '../content/content.gyp:test_support_content', '../media/media.gyp:media_test_support', '../net/net.gyp:net', '../net/net.gyp:net_test_support', diff --git a/chrome_frame/chrome_frame.gyp b/chrome_frame/chrome_frame.gyp index 21dd325..fa5bae3 100644 --- a/chrome_frame/chrome_frame.gyp +++ b/chrome_frame/chrome_frame.gyp @@ -414,7 +414,7 @@ '../chrome/chrome_resources.gyp:chrome_resources', '../content/content.gyp:content_app', '../content/content.gyp:content_gpu', - '../content/content_shell_and_tests.gyp:test_support_content', + '../content/content.gyp:test_support_content', '../net/net.gyp:net', '../net/net.gyp:net_test_support', '../skia/skia.gyp:skia', diff --git a/components/components_tests.gypi b/components/components_tests.gypi index 558b2a9..4325216 100644 --- a/components/components_tests.gypi +++ b/components/components_tests.gypi @@ -43,7 +43,7 @@ 'encryptor', # Dependencies of intercept_navigation_resource_throttle_unittest.cc - '../content/content_shell_and_tests.gyp:test_support_content', + '../content/content.gyp:test_support_content', '../skia/skia.gyp:skia', 'navigation_interception', @@ -93,7 +93,7 @@ 'dependencies': [ '../base/base.gyp:base', '../base/base.gyp:test_support_perf', - '../content/content_shell_and_tests.gyp:test_support_content', + '../content/content.gyp:test_support_content', '../testing/gtest.gyp:gtest', '../ui/compositor/compositor.gyp:compositor', 'visitedlink_browser', diff --git a/content/OWNERS b/content/OWNERS index f6092bf..e6de2ac 100644 --- a/content/OWNERS +++ b/content/OWNERS @@ -19,4 +19,3 @@ per-file content_renderer.gypi=jamesr@chromium.org per-file content_renderer.gypi=jochen@chromium.org per-file content_shell.gypi=jochen@chromium.org per-file content_tests.gypi=jochen@chromium.org -per-file content_shell_and_tests.gyp=jochen@chromium.org diff --git a/content/content.gyp b/content/content.gyp index 7fe5ac4..68a6f40 100644 --- a/content/content.gyp +++ b/content/content.gyp @@ -21,10 +21,14 @@ }], ], }, + 'includes': [ + 'content_tests.gypi', + ], 'conditions': [ ['OS != "ios"', { 'includes': [ '../build/win_precompile.gypi', + 'content_shell.gypi', ], }], # In component mode, we build all of content as a single DLL. diff --git a/content/content_shell.gypi b/content/content_shell.gypi index 7ae398c..644252c 100644 --- a/content/content_shell.gypi +++ b/content/content_shell.gypi @@ -27,18 +27,18 @@ 'chromium_code': 1, }, 'dependencies': [ - 'content.gyp:content_app', - 'content.gyp:content_browser', - 'content.gyp:content_common', - 'content.gyp:content_gpu', - 'content.gyp:content_plugin', - 'content.gyp:content_ppapi_plugin', - 'content.gyp:content_renderer', - 'content.gyp:content_utility', - 'content.gyp:content_worker', - 'content_resources.gyp:content_resources', + 'content_app', + 'content_browser', + 'content_common', + 'content_gpu', + 'content_plugin', + 'content_ppapi_plugin', + 'content_renderer', 'content_shell_resources', + 'content_utility', + 'content_worker', 'test_support_content', + 'content_resources.gyp:content_resources', '../base/base.gyp:base', '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', '../ipc/ipc.gyp:ipc', @@ -664,7 +664,7 @@ 'target_name': 'content_shell_java', 'type': 'none', 'dependencies': [ - 'content.gyp:content_java', + 'content_java', ], 'variables': { 'java_in_dir': '../content/shell/android/java', @@ -691,7 +691,7 @@ 'target_name': 'content_shell_apk', 'type': 'none', 'dependencies': [ - 'content.gyp:content_java', + 'content_java', 'content_java_test_support', 'content_shell_java', 'libcontent_shell_content_view', diff --git a/content/content_shell_and_tests.gyp b/content/content_shell_and_tests.gyp deleted file mode 100644 index 330a0c7..0000000 --- a/content/content_shell_and_tests.gyp +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 2013 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -{ - 'variables': { - 'chromium_code': 1, # Use higher warning level. - }, - 'includes': [ - 'content_tests.gypi', - ], - 'conditions': [ - ['OS != "ios"', { - 'includes': [ - 'content_shell.gypi', - ], - }], - ], -} diff --git a/content/content_tests.gypi b/content/content_tests.gypi index edf06a8..c6a5bbb 100644 --- a/content/content_tests.gypi +++ b/content/content_tests.gypi @@ -16,9 +16,9 @@ '../testing/gtest.gyp:gtest', '../ui/ui.gyp:ui_test_support', '../url/url.gyp:url_lib', - 'content.gyp:content_app', - 'content.gyp:content_browser', - 'content.gyp:content_common', + 'content_app', + 'content_browser', + 'content_common', ], 'include_dirs': [ '..', @@ -161,10 +161,10 @@ ], }, { # OS != "ios" 'dependencies': [ - 'content.gyp:content_child', - 'content.gyp:content_ppapi_plugin', - 'content.gyp:content_utility', - 'content.gyp:content_worker', + 'content_child', + 'content_ppapi_plugin', + 'content_utility', + 'content_worker', '../ppapi/ppapi_internal.gyp:ppapi_host', '../ppapi/ppapi_internal.gyp:ppapi_proxy', '../ppapi/ppapi_internal.gyp:ppapi_shared', @@ -245,8 +245,8 @@ 'type': '<(gtest_target_type)', 'defines!': ['CONTENT_IMPLEMENTATION'], 'dependencies': [ - 'content.gyp:content_browser', - 'content.gyp:content_common', + 'content_browser', + 'content_common', 'test_support_content', 'browser/speech/proto/speech_proto.gyp:speech_proto', '../base/base.gyp:test_support_base', @@ -561,11 +561,11 @@ ], }, { # OS != "ios" 'dependencies': [ - 'content.gyp:content_browser', - 'content.gyp:content_child', - 'content.gyp:content_gpu', - 'content.gyp:content_plugin', - 'content.gyp:content_renderer', + 'content_browser', + 'content_child', + 'content_gpu', + 'content_plugin', + 'content_renderer', 'content_resources.gyp:content_resources', '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', '../gpu/gpu.gyp:gpu', @@ -736,10 +736,10 @@ 'type': '<(gtest_target_type)', 'defines!': ['CONTENT_IMPLEMENTATION'], 'dependencies': [ - 'content.gyp:content_common', - 'content.gyp:content_gpu', - 'content.gyp:content_plugin', - 'content.gyp:content_renderer', + 'content_common', + 'content_gpu', + 'content_plugin', + 'content_renderer', 'content_shell_lib', 'content_shell_pak', 'test_support_content', @@ -987,7 +987,7 @@ 'type': '<(gtest_target_type)', 'defines!': ['CONTENT_IMPLEMENTATION'], 'dependencies': [ - 'content.gyp:content_common', + 'content_common', 'test_support_content', '../base/base.gyp:test_support_base', '../testing/gtest.gyp:gtest', @@ -1008,7 +1008,7 @@ 'type': '<(gtest_target_type)', 'defines!': ['CONTENT_IMPLEMENTATION'], 'dependencies': [ - 'content.gyp:content_common', + 'content_common', 'test_support_content', '../base/base.gyp:test_support_base', '../testing/gtest.gyp:gtest', @@ -1031,7 +1031,7 @@ 'target_name': 'video_decode_accelerator_unittest', 'type': '<(gtest_target_type)', 'dependencies': [ - 'content.gyp:content', + 'content', '../base/base.gyp:base', '../testing/gtest.gyp:gtest', '../media/media.gyp:media', @@ -1100,7 +1100,7 @@ 'target_name': 'h264_parser_unittest', 'type': 'executable', 'dependencies': [ - 'content.gyp:content_common', + 'content_common', '../base/base.gyp:base', '../testing/gtest.gyp:gtest', ], @@ -1127,7 +1127,7 @@ 'target_name': 'content_unittests_apk', 'type': 'none', 'dependencies': [ - 'content.gyp:content_java', + 'content_java', 'content_unittests', ], 'variables': { @@ -1140,8 +1140,8 @@ 'target_name': 'content_browsertests_apk', 'type': 'none', 'dependencies': [ - 'content.gyp:content_java', 'content_browsertests', + 'content_java', 'content_java_test_support', 'content_shell_java', ], @@ -1193,8 +1193,8 @@ 'dependencies': [ '../base/base.gyp:base', '../base/base.gyp:base_java_test_support', - 'content.gyp:content_common', - 'content.gyp:content_java', + 'content_common', + 'content_java', ], 'variables': { 'java_in_dir': '../content/public/test/android/javatests', @@ -1205,7 +1205,7 @@ 'target_name': 'content_shell_test_apk', 'type': 'none', 'dependencies': [ - 'content.gyp:content_java', + 'content_java', 'content_java_test_support', 'content_shell_apk_java', '../base/base.gyp:base_java', diff --git a/ui/views/views.gyp b/ui/views/views.gyp index 995ab16..16c9f6d9 100644 --- a/ui/views/views.gyp +++ b/ui/views/views.gyp @@ -632,7 +632,7 @@ 'dependencies': [ '../../base/base.gyp:base', '../../content/content.gyp:content', - '../../content/content_shell_and_tests.gyp:test_support_content', + '../../content/content.gyp:test_support_content', '../../ipc/ipc.gyp:test_support_ipc', '../../skia/skia.gyp:skia', '../../testing/gtest.gyp:gtest', @@ -973,9 +973,9 @@ '../../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:test_support_content', - '../../content/content_shell_and_tests.gyp:content_shell_lib', + '../../content/content.gyp:test_support_content', '../../skia/skia.gyp:skia', '../../third_party/icu/icu.gyp:icui18n', '../../third_party/icu/icu.gyp:icuuc', |