| Index: ui/gfx/BUILD.gn
|
| diff --git a/ui/gfx/BUILD.gn b/ui/gfx/BUILD.gn
|
| index 8d14c51f1d64a1754b9fcdfd83ed2194a0fe3c08..66072486af7cf73a8ff7e3d22f0dd70c8882304e 100644
|
| --- a/ui/gfx/BUILD.gn
|
| +++ b/ui/gfx/BUILD.gn
|
| @@ -248,6 +248,7 @@ component("gfx") {
|
| "render_text_harfbuzz.h",
|
| "text_utils_skia.cc",
|
| ]
|
| +
|
| # These are the "native" rendering routines, only one should apply.
|
| if (is_win) {
|
| sources += [ "render_text_win.cc" ]
|
| @@ -326,9 +327,7 @@ component("gfx") {
|
|
|
| # Ozone stuff.
|
| if (use_ozone) {
|
| - sources += [
|
| - "platform_font_ozone.cc",
|
| - ]
|
| + sources += [ "platform_font_ozone.cc" ]
|
| }
|
|
|
| if (!use_aura) {
|
| @@ -341,16 +340,10 @@ component("gfx") {
|
| }
|
|
|
| if (use_x11) {
|
| - deps += [
|
| - "//ui/gfx/x",
|
| - ]
|
| - configs += [
|
| - "//build/config/linux:x11",
|
| - ]
|
| + deps += [ "//ui/gfx/x" ]
|
| + configs += [ "//build/config/linux:x11" ]
|
| } else {
|
| - sources -= [
|
| - "path_x11.cc",
|
| - ]
|
| + sources -= [ "path_x11.cc" ]
|
| }
|
|
|
| if (use_pango) {
|
| @@ -363,9 +356,7 @@ component("gfx") {
|
| configs += [ "//build/config/linux:pangocairo" ]
|
| }
|
| if (use_pango && use_ozone) {
|
| - sources -= [
|
| - "platform_font_ozone.cc",
|
| - ]
|
| + sources -= [ "platform_font_ozone.cc" ]
|
| }
|
| }
|
|
|
| @@ -525,15 +516,11 @@ test("gfx_unittests") {
|
| }
|
|
|
| if (is_android || is_ios) {
|
| - sources -= [
|
| - "render_text_unittest.cc",
|
| - ]
|
| + sources -= [ "render_text_unittest.cc" ]
|
| }
|
|
|
| if (use_aura) {
|
| - sources -= [
|
| - "screen_unittest.cc",
|
| - ]
|
| + sources -= [ "screen_unittest.cc" ]
|
| }
|
|
|
| if (is_win) {
|
|
|