Update skia and ui GN builds

ui/base/BUILD.gn

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/config/ui.gni")
 
 if (is_android) {
   import("//build/config/android/config.gni")
   import("//build/config/android/rules.gni")
 }
@@ skipping 176 matching lines @@
     "resource/resource_bundle_mac.mm",
     "resource/resource_bundle_win.cc",
     "resource/resource_bundle_win.h",
     "resource/resource_data_dll_win.cc",
     "resource/resource_data_dll_win.h",
     "resource/resource_handle.h",
     "text/bytes_formatting.cc",
     "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",
     "touch/touch_enabled.h",
     "ui_base_exports.cc",
     "ui_base_paths.cc",
     "ui_base_paths.h",
     "ui_base_switches.cc",
     "ui_base_switches.h",
     "ui_base_switches_util.cc",
@@ skipping 39 matching lines @@
     "window_open_disposition.cc",
     "window_open_disposition.h",
     "work_area_watcher_observer.h",
     "x/x11_menu_list.cc",
     "x/x11_menu_list.h",
     "x/x11_util.cc",
     "x/x11_util.h",
     "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 = [
     "//base",
     "//base/third_party/dynamic_annotations",
     "//base:base_static",
     "//base:i18n",
     "//net",
     "//skia",
     "//third_party/icu",
@@ skipping 40 matching lines @@
     ]
   }
   if (!use_x11) {
     sources -= [
       "x/x11_util.cc",
       "x/x11_util.h",
       "x/x11_util_internal.h",
     ]
   }
 
-  if (!use_ozone) {
-    sources -= [
-      "touch/touch_device_ozone.cc",
-    ]
-  }
-
   if (!use_aura || !is_linux) {
     sources -= [
       "resource/resource_bundle_auralinux.cc",
     ]
   }
 
   if (use_aura && is_win) {
     sources -= [
       "dragdrop/drag_utils_aura.cc",
     ]
@@ skipping 19 matching lines @@
     configs += [
       "//build/config/linux:pangocairo",
     ]
   }
 
   if (is_chromeos || (use_aura && is_linux && !use_x11)) {
     sources += [
       "dragdrop/os_exchange_data_provider_aura.cc",
       "dragdrop/os_exchange_data_provider_aura.h",
     ]
-    sources -= [
-      "touch/touch_device.cc",
-    ]
   }
 
   libs = []
   if (is_win) {
     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
                   # uninteresting.
     ]
     ldflags = [
       "/DELAYLOAD:d2d1.dll",
       "/DELAYLOAD:d3d10_1.dll",
       "/DELAYLOAD:dwmapi.dll",
     ]
@@ skipping 43 matching lines @@
       "//build/config/linux:x11"
     ]
   }
 
   if (use_aura) {
     if (use_x11) {
       sources += [
         "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.
         sources += [
           "dragdrop/os_exchange_data_provider_aurax11.cc",
           "dragdrop/os_exchange_data_provider_aurax11.h",
         ]
       }
     }
   }
@@ skipping 12 matching lines @@
 
   if (is_android) {
     sources -= [
       "default_theme_provider.cc",
       "dragdrop/drag_utils.cc",
       "dragdrop/drag_utils.h",
       "l10n/l10n_font_util.cc",
       "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",
     ]
 
     deps += [
       ":ui_base_jni_headers",
     ]
 
     libs += [
       "jnigraphics",
@@ skipping 66 matching lines @@
       "../android/java/src/org/chromium/ui/base/DeviceFormFactor.java",
       "../android/java/src/org/chromium/ui/base/LocalizationUtils.java",
       "../android/java/src/org/chromium/ui/base/SelectFileDialog.java",
       "../android/java/src/org/chromium/ui/base/TouchDevice.java",
       "../android/java/src/org/chromium/ui/base/ViewAndroid.java",
       "../android/java/src/org/chromium/ui/base/WindowAndroid.java",
     ]
     jni_package = "base"
   }
 }