| Index: BUILD.gn
|
| diff --git a/BUILD.gn b/BUILD.gn
|
| index 7e2cc41e65a7cc2bc124f67a607059b8eef04657..1cda6523dc00558d685fb18adbf291acb1360d17 100644
|
| --- a/BUILD.gn
|
| +++ b/BUILD.gn
|
| @@ -63,103 +63,106 @@ group("gn_all") {
|
| # TODO(GYP): Add build steps that check and enforce this on the bots.
|
| group("both_gn_and_gyp") {
|
| testonly = true
|
| -
|
| deps = [
|
| "//base:base_unittests",
|
| - "//cc:cc_unittests",
|
| - "//chrome",
|
| - "//chrome/test:browser_tests",
|
| - "//chrome/test:interactive_ui_tests",
|
| - "//chrome/test:sync_integration_tests",
|
| - "//chrome/test:unit_tests",
|
| - "//chrome/test/chromedriver:chromedriver_unittests",
|
| - "//components:components_browsertests",
|
| - "//components:components_unittests",
|
| - "//content/shell:content_shell",
|
| - "//content/test:content_browsertests",
|
| - "//content/test:content_perftests",
|
| - "//content/test:content_unittests",
|
| - "//crypto:crypto_unittests",
|
| - "//device:device_unittests",
|
| - "//extensions:extensions_browsertests",
|
| - "//extensions:extensions_unittests",
|
| - "//google_apis/gcm:gcm_unit_tests",
|
| - "//gpu:gpu_unittests",
|
| - "//ipc:ipc_tests",
|
| - "//ipc/mojo:ipc_mojo_unittests",
|
| - "//jingle:jingle_unittests",
|
| - "//media:media_unittests",
|
| - "//media/cast:cast_unittests",
|
| - "//media/midi:midi_unittests",
|
| - "//mojo",
|
| - "//mojo/application/public/cpp",
|
| - "//mojo/common:mojo_common_unittests",
|
| - "//net:hpack_example_generator",
|
| - "//net:hpack_fuzz_mutator",
|
| - "//net:hpack_fuzz_wrapper",
|
| - "//net:net_perftests",
|
| - "//net:net_unittests",
|
| - "//ppapi:ppapi_unittests",
|
| - "//ppapi/examples/2d",
|
| - "//ppapi/examples/audio",
|
| - "//ppapi/examples/audio_input",
|
| - "//ppapi/examples/compositor",
|
| - "//ppapi/examples/crxfs",
|
| - "//ppapi/examples/enumerate_devices",
|
| - "//ppapi/examples/file_chooser",
|
| - "//ppapi/examples/flash_topmost",
|
| - "//ppapi/examples/font",
|
| - "//ppapi/examples/gamepad",
|
| - "//ppapi/examples/gles2",
|
| - "//ppapi/examples/gles2_spinning_cube",
|
| - "//ppapi/examples/ime",
|
| - "//ppapi/examples/input",
|
| - "//ppapi/examples/media_stream_audio",
|
| - "//ppapi/examples/media_stream_video",
|
| - "//ppapi/examples/mouse_cursor",
|
| - "//ppapi/examples/mouse_lock",
|
| - "//ppapi/examples/printing",
|
| - "//ppapi/examples/scaling",
|
| - "//ppapi/examples/scripting",
|
| - "//ppapi/examples/stub",
|
| - "//ppapi/examples/threading",
|
| - "//ppapi/examples/url_loader",
|
| - "//ppapi/examples/video_capture",
|
| - "//ppapi/examples/video_decode",
|
| - "//ppapi/examples/video_effects",
|
| - "//ppapi/examples/video_encode",
|
| - "//printing:printing_unittests",
|
| - "//skia:skia_unittests",
|
| - "//sql:sql_unittests",
|
| - "//sync:sync_unit_tests",
|
| - "//third_party/WebKit/Source/platform:heap_unittests",
|
| - "//third_party/WebKit/Source/platform:platform_unittests",
|
| - "//third_party/WebKit/Source/web:webkit_unit_tests",
|
| - "//third_party/WebKit/Source/wtf:wtf_unittests",
|
| - "//third_party/cacheinvalidation:cacheinvalidation_unittests",
|
| - "//third_party/codesighs",
|
| - "//third_party/mojo/src/mojo/edk/system:mojo_system_unittests",
|
| - "//third_party/mojo/src/mojo/edk/test:mojo_public_bindings_unittests",
|
| - "//third_party/mojo/src/mojo/edk/test:mojo_public_environment_unittests",
|
| - "//third_party/mojo/src/mojo/edk/test:mojo_public_system_unittests",
|
| - "//third_party/mojo/src/mojo/edk/test:mojo_public_utility_unittests",
|
| - "//third_party/pdfium/samples:pdfium_test",
|
| - "//third_party/smhasher:pmurhash",
|
| - "//tools/imagediff($host_toolchain)",
|
| - "//tools/gn",
|
| - "//tools/gn:gn_unittests",
|
| - "//tools/gn:generate_test_gn_data",
|
| - "//tools/telemetry:bitmaptools($host_toolchain)",
|
| - "//ui/accessibility:accessibility_unittests",
|
| - "//ui/app_list:app_list_unittests",
|
| - "//ui/base:ui_base_unittests",
|
| - "//ui/display:display_unittests",
|
| - "//ui/events:events_unittests",
|
| - "//ui/gfx:gfx_unittests",
|
| - "//ui/gl:gl_unittests",
|
| - "//ui/touch_selection:ui_touch_selection_unittests",
|
| - "//url:url_unittests",
|
| ]
|
| + if (!is_ios) {
|
| + deps += [
|
| + "//cc:cc_unittests",
|
| + "//chrome",
|
| + "//chrome/test:browser_tests",
|
| + "//chrome/test:interactive_ui_tests",
|
| + "//chrome/test:sync_integration_tests",
|
| + "//chrome/test:unit_tests",
|
| + "//chrome/test/chromedriver:chromedriver_unittests",
|
| + "//components:components_browsertests",
|
| + "//components:components_unittests",
|
| + "//content/shell:content_shell",
|
| + "//content/test:content_browsertests",
|
| + "//content/test:content_perftests",
|
| + "//content/test:content_unittests",
|
| + "//crypto:crypto_unittests",
|
| + "//device:device_unittests",
|
| + "//extensions:extensions_browsertests",
|
| + "//extensions:extensions_unittests",
|
| + "//google_apis/gcm:gcm_unit_tests",
|
| + "//gpu:gpu_unittests",
|
| + "//ipc:ipc_tests",
|
| + "//ipc/mojo:ipc_mojo_unittests",
|
| + "//jingle:jingle_unittests",
|
| + "//media:media_unittests",
|
| + "//media/cast:cast_unittests",
|
| + "//media/midi:midi_unittests",
|
| + "//mojo",
|
| + "//mojo/application/public/cpp",
|
| + "//mojo/common:mojo_common_unittests",
|
| + "//net:hpack_example_generator",
|
| + "//net:hpack_fuzz_mutator",
|
| + "//net:hpack_fuzz_wrapper",
|
| + "//net:net_perftests",
|
| + "//net:net_unittests",
|
| + "//ppapi:ppapi_unittests",
|
| + "//ppapi/examples/2d",
|
| + "//ppapi/examples/audio",
|
| + "//ppapi/examples/audio_input",
|
| + "//ppapi/examples/compositor",
|
| + "//ppapi/examples/crxfs",
|
| + "//ppapi/examples/enumerate_devices",
|
| + "//ppapi/examples/file_chooser",
|
| + "//ppapi/examples/flash_topmost",
|
| + "//ppapi/examples/font",
|
| + "//ppapi/examples/gamepad",
|
| + "//ppapi/examples/gles2",
|
| + "//ppapi/examples/gles2_spinning_cube",
|
| + "//ppapi/examples/ime",
|
| + "//ppapi/examples/input",
|
| + "//ppapi/examples/media_stream_audio",
|
| + "//ppapi/examples/media_stream_video",
|
| + "//ppapi/examples/mouse_cursor",
|
| + "//ppapi/examples/mouse_lock",
|
| + "//ppapi/examples/printing",
|
| + "//ppapi/examples/scaling",
|
| + "//ppapi/examples/scripting",
|
| + "//ppapi/examples/stub",
|
| + "//ppapi/examples/threading",
|
| + "//ppapi/examples/url_loader",
|
| + "//ppapi/examples/video_capture",
|
| + "//ppapi/examples/video_decode",
|
| + "//ppapi/examples/video_effects",
|
| + "//ppapi/examples/video_encode",
|
| + "//printing:printing_unittests",
|
| + "//skia:skia_unittests",
|
| + "//sql:sql_unittests",
|
| + "//sync:sync_unit_tests",
|
| + "//third_party/WebKit/Source/platform:heap_unittests",
|
| + "//third_party/WebKit/Source/platform:platform_unittests",
|
| + "//third_party/WebKit/Source/web:webkit_unit_tests",
|
| + "//third_party/WebKit/Source/wtf:wtf_unittests",
|
| + "//third_party/cacheinvalidation:cacheinvalidation_unittests",
|
| + "//third_party/codesighs",
|
| + "//third_party/mojo/src/mojo/edk/system:mojo_system_unittests",
|
| + "//third_party/mojo/src/mojo/edk/test:mojo_public_bindings_unittests",
|
| + "//third_party/mojo/src/mojo/edk/test:mojo_public_environment_unittests",
|
| + "//third_party/mojo/src/mojo/edk/test:mojo_public_system_unittests",
|
| + "//third_party/mojo/src/mojo/edk/test:mojo_public_utility_unittests",
|
| + "//third_party/pdfium/samples:pdfium_test",
|
| + "//third_party/smhasher:pmurhash",
|
| + "//tools/imagediff($host_toolchain)",
|
| + "//tools/gn",
|
| + "//tools/gn:gn_unittests",
|
| + "//tools/gn:generate_test_gn_data",
|
| + "//tools/telemetry:bitmaptools($host_toolchain)",
|
| + "//ui/accessibility:accessibility_unittests",
|
| + "//ui/app_list:app_list_unittests",
|
| + "//ui/base:ui_base_unittests",
|
| + "//ui/display:display_unittests",
|
| + "//ui/events:events_unittests",
|
| + "//ui/gfx:gfx_unittests",
|
| + "//ui/gl:gl_unittests",
|
| + "//ui/touch_selection:ui_touch_selection_unittests",
|
| + "//url:url_unittests",
|
| + ]
|
| + }
|
|
|
| deps += root_extra_deps
|
|
|
| @@ -580,7 +583,7 @@ group("both_gn_and_gyp") {
|
| "//crypto:crypto_unittests", # TODO(GYP)
|
| "//net:net_unittests", # TODO(GYP)
|
| ]
|
| - } else if (!is_android) {
|
| + } else if (!is_android && !is_ios) {
|
| deps += [ "//breakpad:symupload" ]
|
| }
|
|
|
| @@ -592,9 +595,11 @@ group("both_gn_and_gyp") {
|
| group("gn_only") {
|
| testonly = true
|
|
|
| - deps = [
|
| - "//mandoline:all",
|
| - ]
|
| + if (!is_ios) {
|
| + deps = [
|
| + "//mandoline:all",
|
| + ]
|
| + }
|
|
|
| if (!is_android && !is_ios) {
|
| deps += [ "//components/proximity_auth:proximity_auth_unittests" ]
|
|
|