Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(268)

Unified Diff: BUILD.gn

Issue 1965183003: chromeos, GN: make it possible to build many unittests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: BUILD.gn
diff --git a/BUILD.gn b/BUILD.gn
index 3fd7ff08c948891953a2eb32c0f241d0a21f3cdb..521f13fc12a8e72cceb4de7d2a53f8c5105d853a 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -424,7 +424,7 @@ group("both_gn_and_gyp") {
]
}
- if (is_android || is_win || (is_linux && !is_chromeos)) {
+ if (is_android || is_win || is_linux) {
deps += [
"//base:build_utf8_validator_tables",
"//base:check_example",
@@ -458,8 +458,6 @@ group("both_gn_and_gyp") {
"//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",
@@ -475,6 +473,12 @@ group("both_gn_and_gyp") {
"//third_party/leveldatabase:env_chromium_unittests",
"//third_party/libaddressinput:libaddressinput_unittests",
]
+ if (!is_chromeos) {
+ deps += [
+ "//media/cast:generate_barcode_video",
+ "//media/cast:generate_timecode_audio",
+ ]
+ }
}
if (!is_android && !is_linux) {
# TODO(dpranke): Re-enable this once
@@ -651,7 +655,7 @@ group("gn_only") {
]
}
- if (is_linux && !is_chromeos && !is_chromecast) {
+ if (is_linux && !is_chromecast) {
# TODO(GYP): Figure out if any of these should be in gn_all
# and figure out how cross-platform they are
deps += [
@@ -667,7 +671,6 @@ group("gn_only") {
"//components/rappor:unit_tests",
"//components/sessions:unit_tests",
"//media/blink:media_blink_unittests",
- "//media/cast:udp_proxy",
"//native_client/src/trusted/debug_stub:gdb_rsp_unittest",
"//storage/browser:dump_file_system",
"//third_party/angle:libANGLE",
@@ -719,6 +722,9 @@ group("gn_only") {
"//ui/views/examples:views_examples_exe",
]
+ if (!is_chromeos) {
+ deps += [ "//media/cast:udp_proxy" ]
dshwang 2016/05/11 10:07:20 cast has unresolved dependencies issues. ERROR Unr
Dirk Pranke 2016/05/13 18:53:54 Do you mean that udp_proxy has unresolved dependen
dshwang 2016/05/18 15:14:42 correct. I didn't investigate how to fix it, but i
+ }
if (target_cpu == "x86" || target_cpu == "x64") {
if (!is_android) {
deps += [ "//chrome/test:load_library_perf_tests" ]
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698