Update skia and ui GN builds

ui/base/BUILD.gn

Index: ui/base/BUILD.gn
diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn
index bd29f554059f824a4deafa52d222c7da6c14d7ea..dec411f7606001bc00811a571404b1dd1810cf32 100644
--- a/ui/base/BUILD.gn
+++ b/ui/base/BUILD.gn
@@ -194,11 +194,7 @@ component("ui_base") {
     "text/bytes_formatting.h",
     "theme_provider.cc",
     "theme_provider.h",
-    "touch/touch_device.cc",
     "touch/touch_device.h",
-    "touch/touch_device_android.cc",
-    "touch/touch_device_ozone.cc",
-    "touch/touch_device_win.cc",
     "touch/touch_editing_controller.cc",
     "touch/touch_editing_controller.h",
     "touch/touch_enabled.cc",
@@ -258,6 +254,19 @@ component("ui_base") {
     "x/x11_util_internal.h",
   ]
 
+  if (is_win) {
+    sources += [ "touch/touch_device_win.cc" ]

[tfarina, 2014/05/30 05:23:27]

why is that? aren't the exclusion rules working?

GYP does this through build/filename_rules.gypi

I think always listing it in the common list and excluding where necessary is
better than adding case-by-case. At least this was the way we were doing in GYP.
Are we going to do different in GN?

Did you actually get any error?

Sorry, I'm just trying to understand what is going on here, and the motivation
behind this change.

+  } else if (is_android) {
+    sources += [ "touch/touch_device_android.cc" ]
+  } else if (use_ozone) {
+    sources += [ "touch/touch_device_ozone.cc" ]
+  } else if (use_aura && use_x11) { 
+    sources += [ "touch/touch_device_aurax11.cc" ]
+  } else {
+    # Empty implementation for all other cases.
+    sources += [ "touch/touch_device.cc" ]
+  }
+
   defines = [ "UI_BASE_IMPLEMENTATION" ]
 
   deps = [
@@ -318,12 +327,6 @@ component("ui_base") {
     ]
   }
 
-  if (!use_ozone) {
-    sources -= [
-      "touch/touch_device_ozone.cc",
-    ]
-  }
-
   if (!use_aura || !is_linux) {
     sources -= [
       "resource/resource_bundle_auralinux.cc",
@@ -363,9 +366,6 @@ component("ui_base") {
       "dragdrop/os_exchange_data_provider_aura.cc",
       "dragdrop/os_exchange_data_provider_aura.h",
     ]
-    sources -= [
-      "touch/touch_device.cc",
-    ]
   }
 
   libs = []
@@ -373,9 +373,6 @@ component("ui_base") {
     deps += [
       "//third_party/wtl",
     ]
-    sources -= [
-      "touch/touch_device.cc",
-    ]
     cflags = [
       "/wd4267",  # TODO(jschuh): C4267: http://crbug.com/167187 size_t -> int.
       "/wd4324",  # Structure was padded due to __declspec(align()), which is
@@ -439,7 +436,6 @@ component("ui_base") {
         "cursor/cursor_loader_x11.cc",
         "cursor/cursor_loader_x11.h",
         "cursor/cursor_x11.cc",
-        "touch/touch_device_aurax11.cc",
       ]
       if (!is_chromeos) {
         # These Aura X11 files aren't used on ChromeOS.
@@ -472,7 +468,6 @@ component("ui_base") {
       "models/button_menu_item_model.cc",
       "models/dialog_model.cc",
       "theme_provider.cc",
-      "touch/touch_device.cc",
       "touch/touch_editing_controller.cc",
       "ui_base_types.cc",
     ]