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

Unified Diff: ui/gfx/BUILD.gn

Issue 1247593008: Fix running gn gen for //ui/* targets on iOS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@rlz
Patch Set: 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
Index: ui/gfx/BUILD.gn
diff --git a/ui/gfx/BUILD.gn b/ui/gfx/BUILD.gn
index a5f095e469f0eb2952eb1bc1d69211278b90fb04..94e93c7248b985286fc0b326e4eaadf14e89a1dd 100644
--- a/ui/gfx/BUILD.gn
+++ b/ui/gfx/BUILD.gn
@@ -506,7 +506,6 @@ test("gfx_unittests") {
"range/range_mac_unittest.mm",
"range/range_unittest.cc",
"range/range_win_unittest.cc",
- "render_text_unittest.cc",
"sequential_id_generator_unittest.cc",
"shadow_value_unittest.cc",
"skbitmap_operations_unittest.cc",
@@ -516,6 +515,10 @@ test("gfx_unittests") {
]
}
+ if (!is_android && !is_ios) {
danakj 2015/07/22 18:26:23 This looks the same as before? Why are you changin
Dirk Pranke 2015/07/22 18:49:36 I think you're right that this is the same as befo
sdefresne 2015/07/23 07:38:03 It is not identical, the previous code was (summar
+ sources += [ "render_text_unittest.cc" ]
+ }
+
# TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
@@ -549,13 +552,9 @@ test("gfx_unittests") {
]
}
- if (is_android || is_ios) {
- sources -= [ "render_text_unittest.cc" ]
- }
-
if (use_aura) {
sources -= [ "screen_unittest.cc" ]
- } else {
+ } else if (!is_ios) {
sources -= [ "nine_image_painter_unittest.cc" ]
}
« ui/compositor/BUILD.gn ('K') | « ui/events/BUILD.gn ('k') | ui/web_dialogs/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698