Pull buildtools to get GN 295140

Fix GN build for ozone and official.

TBR=cmasone@chromium.org

Review URL: https://codereview.chromium.org/552983004

Cr-Commit-Position: refs/heads/master@{#295181}

DEPS

@@ -55,7 +55,7 @@ vars = {
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling build tools
   # and whatever else without interference from each other.
-  'buildtools_revision': 'ea4dc0e322f4c4c3784ace03b47de99184c4cb55',
+  'buildtools_revision': 'c7f8bddc8753b58294437f3754a676e35359336a',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling PDFIum
   # and whatever else without interference from each other.

ash/BUILD.gn

@@ -291,7 +291,6 @@ test("ash_unittests") {
       "magnifier/magnification_controller_unittest.cc",
       "wm/workspace/workspace_window_resizer_unittest.cc",
       "sticky_keys/sticky_keys_overlay_unittest.cc",
-      "sticky_keys/sticky_keys_unittest.cc",
       "system/tray/media_security/multi_profile_media_tray_item_unittest.cc",
       "autoclick/autoclick_unittest.cc",
     ]
@@ -308,7 +307,6 @@ test("ash_unittests") {
     sources -= [
       "accelerators/magnifier_key_scroller_unittest.cc",
       "accelerators/spoken_feedback_toggler_unittest.cc",
-      "touch/touch_transformer_controller_unittest.cc",
     ]
   }
   if (is_chromeos) {
@@ -324,16 +322,19 @@ test("ash_unittests") {
   } else {
     sources -= [
       "display/resolution_notification_controller_unittest.cc",
-      "touch/touch_transformer_controller_unittest.cc",
       "touch/touchscreen_util_unittest.cc",
     ]
   }
 
+  if (!use_x11 || !is_chromeos) {
+    sources -= [ "touch/touch_transformer_controller_unittest.cc", ]
+  }
+
   # TODO(GYP) is this necessary?
   #['OS=="linux" and component=="shared_library" and use_allocator!="none"', {
   # ldflags = "-rdynamic"
 
-  if (use_ozone) {
+  if (!is_chromeos || use_ozone) {
     sources -= [
       "sticky_keys/sticky_keys_unittest.cc",  # crbug.com/354035
     ]

chrome/chrome_repack_locales.gni

@@ -87,7 +87,7 @@ template("_repack_one_locale") {
 
     if (is_chrome_branded) {
       sources += [
-        "${root_gen_dir/chrome/chromium_strings_${locale}.pak",
+        "${root_gen_dir}/chrome/chromium_strings_${locale}.pak",
       ]
       deps += [
         "//chrome/app:chromium_strings",

chrome/common/net/BUILD.gn

@@ -44,6 +44,10 @@ static_library("net") {
       "x509_certificate_model_nss.cc",
       "x509_certificate_model_openssl.cc",
     ]
+  } else if (use_openssl) {
+    sources -= [ "x509_certificate_model_nss.cc" ]
+  } else {
+    sources -= [ "x509_certificate_model_openssl.cc" ]
   }
 
   if (is_android) {
@@ -54,18 +58,6 @@ static_library("net") {
     deps += [ "//third_party/boringssl" ]
   }
 
-  if (use_openssl) {
-    # networking_private_crypto.cc uses NSS functions.
-    sources -= [
-      "x509_certificate_model_nss.cc",
-    ]
-  } else if (is_linux) {
-    # Already removed for non-Linux cases above.
-    sources -= [
-      "x509_certificate_model_openssl.cc",
-    ]
-  }
-
   if (is_win) {
     cflags = [ "/wd4267" ]
   }

third_party/mach_override/BUILD.gn

@@ -24,6 +24,12 @@ static_library("libudis86") {
     "HAVE_ASSERT_H",
     "HAVE_STRING_H",
   ]
+
+  # syn.c doesn't specify a return value when it issues an assertion.
+  cflags = [ "-Wno-return-type" ]
+
+  configs -= [ "//build/config/compiler:chromium_code" ]
+  configs += [ "//build/config/compiler:no_chromium_code" ]
 }
 
 static_library("mach_override") {

ui/base/BUILD.gn

@@ -763,7 +763,6 @@ test("unittests") {
           "ime/input_method_chromeos_unittest.cc",
         ]
       }
-      sources -= [ "ime/composition_text_util_pango_unittest.cc" ]
     }
   }
 
@@ -771,13 +770,15 @@ test("unittests") {
     sources += [
       "ime/candidate_window_unittest.cc",
       "ime/chromeos/character_composer_unittest.cc",
-      "ime/composition_text_util_pango_unittest.cc",
       "ime/input_method_base_unittest.cc",
       "ime/input_method_chromeos_unittest.cc",
       "ime/remote_input_method_win_unittest.cc",
       "ime/win/imm32_manager_unittest.cc",
       "ime/win/tsf_input_scope_unittest.cc",
     ]
+    if (use_x11) {
+      sources += [ "ime/composition_text_util_pango_unittest.cc" ]
+    }
   }
 
   deps = [

ui/ozone/platform/dri/BUILD.gn

@@ -88,6 +88,7 @@ if (ozone_platform_dri) {
   }
 
   source_set("dri_unittests") {
+    testonly = true
     sources = [
       "dri_surface_factory_unittest.cc",
       "dri_surface_unittest.cc",

ui/views/views.gyp

@@ -438,8 +438,6 @@
       'widget/desktop_aura/desktop_window_tree_host_win.h',
     ],
     'views_desktop_aura_ozone_sources': [
-      'widget/desktop_aura/desktop_cursor_loader_updater_auralinux.cc',
-      'widget/desktop_aura/desktop_cursor_loader_updater_auralinux.h',
       'widget/desktop_aura/desktop_factory_ozone.cc',
       'widget/desktop_aura/desktop_factory_ozone.h',
       'widget/desktop_aura/desktop_screen_ozone.cc',