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

Unified Diff: ui/base/BUILD.gn

Issue 1206033005: Rework how isolates are generated in MB. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: clean up osmesa, add comments about ui_test_pak Created 5 years, 5 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 | « tools/mb/mb.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/BUILD.gn
diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn
index 00ad6a4a3b823c73b801b59134e193292445ccdb..824fe9ba075b210fc605225c552b1269122fdc85 100644
--- a/ui/base/BUILD.gn
+++ b/ui/base/BUILD.gn
@@ -627,6 +627,16 @@ if (is_android) {
}
}
+#
+# TODO(GYP): Delete this after we've converted everything to GN.
+# The _run targets exist only for compatibility w/ GYP.
+group("ui_base_unittests_run") {
+ testonly = true
+ deps = [
+ ":ui_base_unittests",
+ ]
+}
+
# GYP version: ui/base/ui_base_tests.gyp:ui_base_unittests
test("ui_base_unittests") {
sources = [
@@ -648,6 +658,9 @@ test("ui_base_unittests") {
"user_activity/user_activity_detector_unittest.cc",
]
+ data = []
+ data_deps = []
+
if (is_android) {
sources -= [ "user_activity/user_activity_detector_unittest.cc" ]
}
@@ -784,9 +797,7 @@ test("ui_base_unittests") {
"//ui/gfx/x",
]
- datadeps = [
- "//tools/xdisplaycheck",
- ]
+ data_deps += [ "//tools/xdisplaycheck" ]
}
if (is_mac) {
@@ -818,5 +829,33 @@ test("ui_base_unittests") {
"//ui/events:dom_keycode_converter",
]
}
+
+ if (is_linux || is_mac || is_win) {
+ # TODO(brettw): We should be able to depend on //ui/resources:ui_test_pak
+ # instead of depending directly on the non-test .pak files, but depending
+ # on ui_test_pak seems to have no effect.
+ data += [
+ "test/data/data_pack_unittest/truncated-header.pak",
+ "$root_out_dir/ui_test.pak", # TODO(brettw): remove this line.
+ ]
+ data_deps += [
+ "//ui/resources:ui_test_pak", # TODO(brettw): this does nothing.
+ "//third_party/mesa:osmesa",
+ ]
+ }
+ if (is_linux || is_win) {
+ data += [
+ # TODO(brettw): Remove these two lines.
+ "$root_out_dir/ui/en-US.pak",
+ "$root_gen_dir/ui/resources/ui_resources_100_percent.pak",
+ ]
+ }
+ if (is_mac) {
+ data += [ "$root_out_dir/ui_unittests Framework.framework/" ]
+
+ if (use_asan && symbol_level == 0) {
+ data += [ "$root_out_dir/ui_base_unittests.dSYM/" ]
+ }
+ }
}
# TODO(GYP) Mac (ui_base_tests_bundle)
« no previous file with comments | « tools/mb/mb.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698