summaryrefslogtreecommitdiffstats
path: root/www/chromium/files/patch-ui_base_BUILD.gn
diff options
context:
space:
mode:
Diffstat (limited to 'www/chromium/files/patch-ui_base_BUILD.gn')
-rw-r--r--www/chromium/files/patch-ui_base_BUILD.gn16
1 files changed, 8 insertions, 8 deletions
diff --git a/www/chromium/files/patch-ui_base_BUILD.gn b/www/chromium/files/patch-ui_base_BUILD.gn
index 3b91873..0b4e7fc 100644
--- a/www/chromium/files/patch-ui_base_BUILD.gn
+++ b/www/chromium/files/patch-ui_base_BUILD.gn
@@ -1,6 +1,6 @@
---- ui/base/BUILD.gn.orig 2017-04-19 19:06:54 UTC
+--- ui/base/BUILD.gn.orig 2017-06-05 19:03:30 UTC
+++ ui/base/BUILD.gn
-@@ -357,7 +357,7 @@ component("base") {
+@@ -361,7 +361,7 @@ component("base") {
sources += [ "touch/touch_device_android.cc" ]
} else if (is_ios) {
sources += [ "touch/touch_device_ios.cc" ]
@@ -9,7 +9,7 @@
sources += [ "touch/touch_device_linux.cc" ]
} else {
# Empty implementation for all other cases.
-@@ -467,11 +467,11 @@ component("base") {
+@@ -471,11 +471,11 @@ component("base") {
]
}
@@ -23,8 +23,8 @@
deps += [ "//build/linux:fontconfig" ]
}
-@@ -479,7 +479,7 @@ component("base") {
- configs += [ "//build/config/linux:glib" ]
+@@ -488,7 +488,7 @@ component("base") {
+ ]
}
- if (is_linux) {
@@ -32,7 +32,7 @@
if (!toolkit_views && !use_aura) {
sources -= [
"dragdrop/drag_utils.cc",
-@@ -831,7 +831,7 @@ test("ui_base_unittests") {
+@@ -844,7 +844,7 @@ test("ui_base_unittests") {
"ime/win/imm32_manager_unittest.cc",
"ime/win/tsf_input_scope_unittest.cc",
]
@@ -41,7 +41,7 @@
sources += [ "ime/input_method_auralinux_unittest.cc" ]
}
if (use_x11) {
-@@ -952,7 +952,7 @@ test("ui_base_unittests") {
+@@ -967,7 +967,7 @@ test("ui_base_unittests") {
]
}
@@ -50,7 +50,7 @@
# 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.
-@@ -965,7 +965,7 @@ test("ui_base_unittests") {
+@@ -980,7 +980,7 @@ test("ui_base_unittests") {
"//third_party/mesa:osmesa",
]
}
OpenPOWER on IntegriCloud