BASELINE: Update Chromium to 55.0.2883.105

And updates ninja to 1.7.2

Change-Id: I20d43c737f82764d857ada9a55586901b18b9243
Reviewed-by: Michael Brüning <michael.bruning@qt.io>

3 files changed, 12 insertions, 227 deletions

diff --git a/chromium/chrome/tools/build/repack_locales.py b/chromium/chrome/tools/build/repack_locales.py
index f5b84dfd47f..7708d07ec82 100755
--- a/chromium/chrome/tools/build/repack_locales.py
+++ b/chromium/chrome/tools/build/repack_locales.py
@@ -14,8 +14,10 @@ import optparse
 import os
 import sys
 
-sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..', '..',
-                             'tools', 'grit'))
+# Prepend the grit module from the source tree so it takes precedence over other
+# grit versions that might present in the search path.
+sys.path.insert(1, os.path.join(os.path.dirname(__file__), '..', '..', '..',
+                                'tools', 'grit'))
 from grit.format import data_pack
 
 # The gyp "branding" variable.
@@ -96,8 +98,8 @@ def calc_inputs(locale):
                 'components_%s_strings_%s.pak' % (BRANDING, locale)))
 
   if USE_ASH:
-    #e.g. '<(SHARED_INTERMEDIATE_DIR)/ash/strings/ash_strings_da.pak',
-    inputs.append(os.path.join(SHARE_INT_DIR, 'ash', 'strings',
+    #e.g. '<(SHARED_INTERMEDIATE_DIR)/ash/common/strings/ash_strings_da.pak',
+    inputs.append(os.path.join(SHARE_INT_DIR, 'ash', 'common', 'strings',
                   'ash_strings_%s.pak' % locale))
 
   if CHROMEOS:
diff --git a/chromium/chrome/tools/build/win/syzygy/BUILD.gn b/chromium/chrome/tools/build/win/syzygy/BUILD.gn
index 822a645f3e4..08139f1bb3f 100644
--- a/chromium/chrome/tools/build/win/syzygy/BUILD.gn
+++ b/chromium/chrome/tools/build/win/syzygy/BUILD.gn
@@ -5,67 +5,15 @@
 import("//build/config/chrome_build.gni")
 import("//build/config/compiler/compiler.gni")
 import("//build/config/sanitizers/sanitizers.gni")
-
-assert(!syzygy_optimize || !is_syzyasan,
-       "Don't do both syzygy_optimize and is_syzyasan")
+import("//build/win/syzygy/syzygy.gni")
 
 # Where the output binaries will be placed.
 syzygy_dest_dir = "$root_out_dir/syzygy"
 
-if (syzygy_optimize) {
-  # Generates a Syzygy optimize target.
-  #
-  #   dll_name (required)
-  #     Name of the DLL to be instrumented, with no extension or path. This
-  #     ${dll_name}.dll is assumed to be in the output directory and must be
-  #     generated by a dependency of this target.
-  #
-  #   deps (required)
-  #     Normal meaning.
-  #
-  #   data_deps
-  #     Normal meaning.
-  template("syzygy_optimize") {
-    action(target_name) {
-      if (defined(invoker.visibility)) {
-        visibility = invoker.visibility
-      }
-      script = "//chrome/tools/build/win/syzygy/reorder.py"
-
-      dll_name = invoker.dll_name
-      input_dll = "$root_out_dir/$dll_name.dll"
-      input_pdb = "$root_out_dir/$dll_name.dll.pdb"
-
-      inputs = [
-        input_dll,
-        #input_pdb,
-      ]
-
-      outputs = [
-        "$syzygy_dest_dir/$dll_name.dll",
-        "$syzygy_dest_dir/$dll_name.dll.pdb",
-      ]
-
-      args = [
-        "--input_executable",
-        rebase_path(input_dll, root_build_dir),
-        "--input_symbol",
-        rebase_path(input_pdb, root_build_dir),
-        "--destination_dir",
-        rebase_path(syzygy_dest_dir, root_build_dir),
-      ]
-
-      forward_variables_from(invoker,
-                             [
-                               "deps",
-                               "data_deps",
-                               "public_deps",
-                             ])
-    }
-  }
-
-  syzygy_optimize("chrome_dll_syzygy") {
-    dll_name = "chrome"
+if (is_syzyasan) {
+  syzygy_asan("chrome_dll_syzygy") {
+    binary_name = "chrome.dll"
+    dest_dir = syzygy_dest_dir
     deps = [
       "//chrome:main_dll",
     ]
@@ -75,100 +23,6 @@ if (syzygy_optimize) {
       ]
     }
   }
-  if (is_multi_dll_chrome) {
-    # Also instrument chrome_child.dll.
-    syzygy_optimize("chrome_child_dll_syzygy") {
-      dll_name = "chrome_child"
-      deps = [
-        "//chrome:chrome_child",
-      ]
-    }
-  }
-} else if (is_syzyasan) {
-  # Instruments a binary with SyzyAsan.
-  #
-  #   binary_name (required)
-  #     Name of the binary to be instrumented, with no extension or path. This
-  #     binary_name is assumed to be in the output directory and must be
-  #     generated by a dependency of this target.
-  #
-  #   dest_dir (required)
-  #     The destination directory where the instrumented image should be
-  #     written.
-  #
-  #   deps (required)
-  #     Normal meaning.
-  #
-  #   public_deps
-  #     Normal meaning.
-  #
-  #   data_deps
-  #     Normal meaning.
-  template("syzygy_asan") {
-    action(target_name) {
-      if (defined(invoker.visibility)) {
-        visibility = invoker.visibility
-      }
-      script = "//chrome/tools/build/win/syzygy/instrument.py"
-
-      filter = "syzyasan-instrumentation-filter.txt"
-
-      binary_name = invoker.binary_name
-      dest_dir = invoker.dest_dir
-      input_image = "$root_out_dir/$binary_name"
-      input_pdb = "$root_out_dir/$binary_name.pdb"
-
-      inputs = [
-        filter,
-        input_image,
-
-        #input_pdb,
-      ]
-
-      output_filter = "$dest_dir/win-syzyasan-filter-$binary_name.txt.json"
-
-      outputs = [
-        "$dest_dir/$input_image",
-        "$dest_dir/$input_image.pdb",
-        output_filter,
-      ]
-
-      args = [
-        "--mode",
-        "asan",
-        "--input_executable",
-        rebase_path(input_image, root_build_dir),
-        "--input_symbol",
-        rebase_path(input_pdb, root_build_dir),
-        "--filter",
-        rebase_path(filter, root_build_dir),
-        "--output-filter-file",
-        rebase_path(output_filter, root_build_dir),
-        "--destination_dir",
-        rebase_path(dest_dir, root_build_dir),
-      ]
-
-      deps = [
-        "//chrome/tools/build/win/syzygy:copy_syzyasan_binaries",
-      ]
-      if (defined(invoker.deps)) {
-        deps += invoker.deps
-      }
-      forward_variables_from(invoker,
-                             [
-                               "data_deps",
-                               "public_deps",
-                             ])
-    }
-  }
-
-  syzygy_asan("chrome_dll_syzygy") {
-    binary_name = "chrome.dll"
-    dest_dir = syzygy_dest_dir
-    deps = [
-      "//chrome:main_dll",
-    ]
-  }
 
   if (is_multi_dll_chrome) {
     # Also instrument chrome_child.dll.
@@ -189,22 +43,16 @@ if (syzygy_optimize) {
       } else {
         dest_dir = syzygy_dest_dir
       }
-
-      data_deps = [
-        ":chrome_child_dll_syzygy",
-      ]
     }
 
     if (is_official_build) {
       # Copies the uninstrumented chrome_child.dll.
-      # GYP version: chrome/chrome_syzygy.gyp:chrome_child_dll_syzygy_copy
       copy("chrome_child_dll_syzygy_copy") {
         sources = [
           "$root_out_dir/chrome_child.dll",
-          "$root_out_dir/chrome_child.dll.pdb",
         ]
         outputs = [
-          "$dest_dir/{{source_file_part}}",
+          "$syzygy_dest_dir/{{source_file_part}}",
         ]
         deps = [
           "//chrome:chrome_child",
@@ -223,24 +71,5 @@ if (syzygy_optimize) {
   }
 }
 
-if (is_syzyasan || syzygy_optimize) {
-  copy("copy_syzyasan_binaries") {
-    visibility = [ "//chrome/*" ]
-
-    source_dir = "//third_party/syzygy/binaries/exe"
-
-    sources = [
-      "$source_dir/agent_logger.exe",
-      "$source_dir/minidump_symbolizer.py",
-      "$source_dir/syzyasan_rtl.dll",
-      "$source_dir/syzyasan_rtl.dll.pdb",
-    ]
-
-    outputs = [
-      "$syzygy_dest_dir/{{source_file_part}}",
-    ]
-  }
-}
-
 # Prevent unused variable warning for code paths where this is unused.
 assert(syzygy_dest_dir != "")
diff --git a/chromium/chrome/tools/convert_dict/convert_dict.gyp b/chromium/chrome/tools/convert_dict/convert_dict.gyp
deleted file mode 100644
index dc6b5b151bc..00000000000
--- a/chromium/chrome/tools/convert_dict/convert_dict.gyp
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 2013 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.
-
-{
-  'variables': {
-    'chromium_code': 1,
-  },
-  'targets': [
-    {
-      # GN version: //chrome/tools/convert_dict:lib
-      'target_name': 'convert_dict_lib',
-      'product_name': 'convert_dict',
-      'type': 'static_library',
-      'variables': { 'enable_wexit_time_destructors': 1, },
-      'include_dirs': [
-        '../../../',
-      ],
-      'dependencies': [
-        '../../../base/base.gyp:base',
-      ],
-      'sources': [
-        'aff_reader.cc',
-        'aff_reader.h',
-        'dic_reader.cc',
-        'dic_reader.h',
-        'hunspell_reader.cc',
-        'hunspell_reader.h',
-      ],
-    },
-    {
-      'target_name': 'convert_dict',
-      'type': 'executable',
-      'variables': { 'enable_wexit_time_destructors': 1, },
-      'dependencies': [
-        '../../../base/base.gyp:base',
-        '../../../base/base.gyp:base_i18n',
-        '../../../third_party/hunspell/hunspell.gyp:hunspell',
-        'convert_dict_lib',
-      ],
-      'sources': [
-        'convert_dict.cc',
-      ],
-    },
-  ],
-}