Update skia and ui GN builds

ui/events/BUILD.gn

Index: ui/events/BUILD.gn
diff --git a/ui/events/BUILD.gn b/ui/events/BUILD.gn
index d5ce1dbada4d51a68ae41d5afe9f3e0ebe988a7d..e1e0e8b4dcd6bf3d463df09b798dc0d7206d1073 100644
--- a/ui/events/BUILD.gn
+++ b/ui/events/BUILD.gn
@@ -4,7 +4,7 @@
 
 import("//build/config/ui.gni")
 
-static_library("dom4_keycode_converter") {
+source_set("dom4_keycode_converter") {
   sources = [
     "keycodes/dom4/keycode_converter.cc",
     "keycodes/dom4/keycode_converter.h",
@@ -98,16 +98,6 @@ component("events") {
     "events_stub.cc",
     "gestures/gesture_configuration.cc",
     "gestures/gesture_configuration.h",
-    "gestures/gesture_point.cc",
-    "gestures/gesture_point.h",
-    "gestures/gesture_recognizer.h",
-    "gestures/gesture_recognizer_impl.cc",
-    "gestures/gesture_recognizer_impl.h",
-    "gestures/gesture_sequence.cc",
-    "gestures/gesture_sequence.h",
-    "gestures/gesture_types.h",
-    "gestures/velocity_calculator.cc",
-    "gestures/velocity_calculator.h",
     "platform/platform_event_dispatcher.h",
     "platform/platform_event_observer.h",
     "platform/platform_event_source.cc",
@@ -122,6 +112,25 @@ component("events") {
     "x/events_x.cc",
   ]
 
+  if (use_aura) {
+    sources += [
+      "gestures/gesture_point.cc",
+      "gestures/gesture_point.h",
+      "gestures/gesture_provider_aura.cc",
+      "gestures/gesture_provider_aura.h",
+      "gestures/gesture_recognizer.h",
+      "gestures/gesture_recognizer_impl.cc",
+      "gestures/gesture_recognizer_impl.h",
+      "gestures/gesture_sequence.cc",
+      "gestures/gesture_sequence.h",
+      "gestures/gesture_types.h",
+      "gestures/motion_event_aura.cc",
+      "gestures/motion_event_aura.h",
+      "gestures/velocity_calculator.cc",
+      "gestures/velocity_calculator.h",
+    ]
+  }
+
   if (use_x11) {
     configs += [
       "//build/config/linux:glib",
@@ -264,6 +273,7 @@ source_set("events_test_support") {
   }
 }
 
+if (!is_android) {  # TODO(GYP) make this link on Android.
 test("events_unittests") {
   sources = [
     "cocoa/cocoa_event_utils_unittest.mm",
@@ -271,7 +281,6 @@ test("events_unittests") {
     "event_processor_unittest.cc",
     "event_rewriter_unittest.cc",
     "event_unittest.cc",
-    "gestures/velocity_calculator_unittest.cc",
     "gesture_detection/bitset_32_unittest.cc",
     "gesture_detection/gesture_provider_unittest.cc",
     "gesture_detection/mock_motion_event.h",
@@ -295,6 +304,29 @@ test("events_unittests") {
       "ozone/evdev/key_event_converter_evdev_unittest.cc",
       "ozone/evdev/touch_event_converter_evdev_unittest.cc",
     ]
+    deps += [
+      "//ui/events/ozone",
+      "//ui/events/ozone:events_ozone_evdev",
+    ]
+  }
+  if (use_aura) {
+    sources += [
+      "gestures/motion_event_aura_unittest.cc",
+      "gestures/velocity_calculator_unittest.cc",
+    ]
+  }
+
+  # Exclude tests that rely on event_utils.h for platforms that do not
+  # provide native cracking, i.e., platforms that use events_stub.cc.
+  if (!is_win && !use_x11 && !use_ozone) {
+    sources -= [ "event_unittest.cc" ]
+  }
+
+  if (is_android) {
+    deps += [
+      #TODO(GYP)
+      #'../../testing/android/native_test.gyp:native_test_native_code',
+    ]
   }
 
   deps = [
@@ -303,9 +335,11 @@ test("events_unittests") {
     ":events_test_support",
     ":gesture_detection",
     "//base",
+    "//base/allocator",
     "//base/test:run_all_unittests",
     "//skia",
     "//testing/gtest",
     "//ui/gfx:gfx_test_support",
   ]
 }
+}  # !is_android