Index: BUILD.gn |
diff --git a/BUILD.gn b/BUILD.gn |
index 76c24b996e883c784bd135a23bf073e441b08825..63494a3181fcb6aa0f34ce2a45c12310e311e7bf 100644 |
--- a/BUILD.gn |
+++ b/BUILD.gn |
@@ -314,6 +314,7 @@ group("both_gn_and_gyp") { |
"//chrome/android:chrome_public_apk", |
"//chrome/android:chrome_public_test_apk", |
"//chrome/test/chromedriver/test/webview_shell:chromedriver_webview_shell_apk", |
+ "//content/shell/android:content_shell_test_apk", |
"//third_party/custom_tabs_client:custom_tabs_client_example_apk", |
] |
} |
@@ -385,26 +386,15 @@ group("both_gn_and_gyp") { |
] |
} |
- if (is_win || (is_linux && !is_chromeos)) { |
- # TODO(GYP): Figure out which of these should (and can) build |
- # for android/chromeos/mac/ios. |
+ if (is_android || is_win || (is_linux && !is_chromeos)) { |
deps += [ |
"//base:build_utf8_validator_tables", |
"//base:check_example", |
"//cc:cc_perftests", |
"//cc/blink:cc_blink_unittests", |
- "//chrome/test:load_library_perf_tests", |
- "//chrome/test:performance_browser_tests", |
- "//chrome/test:sync_performance_tests", |
- "//chrome/test/chromedriver:chromedriver", |
- "//chrome/test/chromedriver:chromedriver_tests", |
"//components:components_perftests", |
"//content/test:content_gl_benchmark", |
"//content/test:content_gl_tests", |
- "//courgette:courgette", |
- "//courgette:courgette_fuzz", |
- "//courgette:courgette_minimal_tool", |
- "//courgette:courgette_unittests", |
"//device:device_unittests", |
"//gin:gin_shell", |
"//gin:gin_unittests", |
@@ -413,28 +403,44 @@ group("both_gn_and_gyp") { |
"//gpu:gpu_perftests", |
"//ipc:ipc_perftests", |
"//media:media_perftests", |
- "//net:crash_cache", |
- "//net:crl_set_dump", |
- "//net:dns_fuzz_stub", |
"//net:dump_cache", |
- "//net:gdig", |
- "//net:get_server_time", |
- "//net:net_watcher", # TODO(GYP): This should be conditional on use_v8_in_net |
- "//net:run_testserver", |
- "//net:stress_cache", |
- "//net:tld_cleanup", |
- "//ppapi:pepper_hash_for_uma", |
- "//ppapi:ppapi_perftests", |
"//sync:run_sync_testserver", |
- "//third_party/angle/src/tests:angle_unittests", |
"//third_party/codesighs:maptsvdifftool", |
- "//third_party/leveldatabase:env_chromium_unittests", |
- "//third_party/libaddressinput:libaddressinput_unittests", |
"//third_party/libphonenumber:libphonenumber_unittests", |
"//ui/compositor:compositor_unittests", |
] |
- if (!is_linux) { |
+ # TODO(GYP): Figure out which of these should (and can) build |
+ # for chromeos/mac/ios. |
+ if (!is_android) { |
+ deps += [ |
+ "//chrome/test:load_library_perf_tests", |
+ "//chrome/test:sync_performance_tests", |
+ "//chrome/test/chromedriver:chromedriver", |
+ "//chrome/test/chromedriver:chromedriver_tests", |
+ "//courgette:courgette", |
+ "//courgette:courgette_fuzz", |
+ "//courgette:courgette_minimal_tool", |
+ "//courgette:courgette_unittests", |
+ "//media/cast:generate_barcode_video", |
+ "//media/cast:generate_timecode_audio", |
+ "//net:crash_cache", |
+ "//net:crl_set_dump", |
+ "//net:dns_fuzz_stub", |
+ "//net:gdig", |
+ "//net:get_server_time", |
+ "//net:net_watcher", # TODO(GYP): This should be conditional on use_v8_in_net |
+ "//net:run_testserver", |
+ "//net:stress_cache", |
+ "//net:tld_cleanup", |
+ "//ppapi:pepper_hash_for_uma", |
+ "//ppapi:ppapi_perftests", |
+ "//third_party/angle/src/tests:angle_unittests", |
+ "//third_party/leveldatabase:env_chromium_unittests", |
+ "//third_party/libaddressinput:libaddressinput_unittests", |
+ ] |
+ } |
+ if (!is_android && !is_linux) { |
# TODO(dpranke): Re-enable this once |
# https://chromium-review.googlesource.com/#/c/312298/1 is rolled |
# into chromium. |
@@ -478,12 +484,14 @@ group("both_gn_and_gyp") { |
} |
} |
- if (is_linux && !is_chromeos) { |
+ if (is_android || (is_linux && !is_chromeos)) { |
deps += [ |
# TODO(GYP): Figure out which of these should (and can) build |
# under which other conditions. |
- "//build/sanitizers:copy_llvm_symbolizer", |
- "//chrome/test:chrome_app_unittests", |
+ "//breakpad:dump_syms($host_toolchain)", |
+ "//breakpad:microdump_stackwalk($host_toolchain)", |
+ "//breakpad:minidump_dump($host_toolchain)", |
+ "//breakpad:minidump_stackwalk($host_toolchain)", |
"//cloud_print:cloud_print_unittests", |
"//components/network_hints/browser", |
"//content/public/app:browser", |
@@ -492,35 +500,35 @@ group("both_gn_and_gyp") { |
# TODO(GYP): Remove this when the gles2 tests work |
"//gpu/command_buffer/client:gles2_implementation_no_check", |
"//gpu/khronos_glcts_support:khronos_glcts_test", # TODO(GYP) crbug.com/471903 to make this complete. |
- "//media/cast:tap_proxy", |
- "//media/cast:testing_tools", |
"//mojo/application/public/cpp", |
- "//skia:filter_fuzz_stub", |
- "//skia:image_operations_bench", |
- "//sync/tools:sync_client", |
- "//sync/tools:sync_listen_notifications", |
"//testing/gmock:gmock_main", |
# TODO(use-new-edk): |
#"//mojo/edk/test:mojo_public_system_perftests", |
"//third_party/codesighs:nm2tsv", |
"//third_party/mojo/src/mojo/edk/test:mojo_public_system_perftests", |
- "//third_party/sqlite:sqlite_shell", |
- "//ui/keyboard:keyboard_unittests", |
- "//ui/message_center:message_center_unittests", |
- "//ui/snapshot:snapshot_unittests", |
- "//ui/views/examples:views_examples_with_content_exe", |
] |
- deps += [ |
- "//breakpad:dump_syms($host_toolchain)", |
- "//breakpad:microdump_stackwalk($host_toolchain)", |
- "//breakpad:minidump_dump($host_toolchain)", |
- "//breakpad:minidump_stackwalk($host_toolchain)", |
- ] |
+ if (!is_android) { |
+ deps += [ |
+ "//build/sanitizers:copy_llvm_symbolizer", |
+ "//chrome/test:chrome_app_unittests", |
+ "//media/cast:cast_benchmarks", |
+ "//media/cast:tap_proxy", |
+ "//skia:filter_fuzz_stub", |
+ "//skia:image_operations_bench", |
+ "//sync/tools:sync_client", |
+ "//sync/tools:sync_listen_notifications", |
+ "//third_party/sqlite:sqlite_shell", |
+ "//ui/keyboard:keyboard_unittests", |
+ "//ui/message_center:message_center_unittests", |
+ "//ui/snapshot:snapshot_unittests", |
+ "//ui/views/examples:views_examples_with_content_exe", |
+ ] |
- if (!is_debug && !is_component_build) { |
- deps += [ "//chrome/tools/service_discovery_sniffer" ] |
+ if (!is_debug && !is_component_build) { |
+ deps += [ "//chrome/tools/service_discovery_sniffer" ] |
+ } |
} |
if (toolkit_views) { |
@@ -602,7 +610,7 @@ group("gn_only") { |
deps += [ "//mojo/common:mojo_common_perftests" ] |
} |
- if (!is_ios && !is_chromecast) { |
+ if (!is_mac && !is_ios && !is_chromecast) { |
deps += [ "//mandoline:all" ] |
} |
@@ -619,10 +627,8 @@ group("gn_only") { |
# and figure out how cross-platform they are |
deps += [ |
":gn_mojo_targets", |
- "//blimp:blimp_tests", |
"//chrome/browser/resources:extension_resource_demo", |
"//chrome/installer/util:strings", |
- "//chrome/test:load_library_perf_tests", |
"//chrome/tools/convert_dict", |
"//components/constrained_window:unit_tests", |
"//components/enhanced_bookmarks:test_support", |
@@ -684,6 +690,9 @@ group("gn_only") { |
] |
if (target_cpu == "x86" || target_cpu == "x64") { |
+ if (!is_android) { |
+ deps += [ "//chrome/test:load_library_perf_tests" ] |
+ } |
deps += [ |
"//native_client/src/trusted/platform_qualify:vcpuid", |
"//third_party/libjpeg_turbo:simd_asm", |
@@ -695,21 +704,24 @@ group("gn_only") { |
if (use_ozone) { |
deps += [ "//ui/ozone/demo" ] |
} |
- if (is_android) { |
- deps += [ "//build/android/gyp/test:hello_world" ] |
- } |
if (is_linux && current_toolchain == host_toolchain) { |
deps += [ "//v8:d8" ] |
} |
} |
- if (is_android || is_linux || is_chromeos) { |
- deps += [ "//blimp" ] |
+ if (is_android) { |
+ deps += [ |
+ "//build/android/gyp/test:hello_world", |
+ "//build/android/incremental_install:bootstrap_java", |
+ ] |
} |
- if (is_mac) { |
- deps -= [ "//mandoline:all" ] # TODO(GYP) |
+ if (!is_chromecast && (is_android || is_linux || is_chromeos)) { |
+ deps += [ |
+ "//blimp", |
+ "//blimp:blimp_tests", |
+ ] |
} |
if (use_libfuzzer || use_drfuzz) { |