diff options
author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-07-14 17:41:05 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-08-04 12:37:36 +0000 |
commit | 399c965b6064c440ddcf4015f5f8e9d131c7a0a6 (patch) | |
tree | 6b06b60ff365abef0e13b3503d593a0df48d20e8 /chromium/chrome/tools | |
parent | 7366110654eec46f21b6824f302356426f48cd74 (diff) | |
download | qtwebengine-chromium-399c965b6064c440ddcf4015f5f8e9d131c7a0a6.tar.gz |
BASELINE: Update Chromium to 52.0.2743.76 and Ninja to 1.7.1
Change-Id: I382f51b959689505a60f8b707255ecb344f7d8b4
Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/chrome/tools')
-rwxr-xr-x | chromium/chrome/tools/build/repack_locales.py | 12 | ||||
-rw-r--r-- | chromium/chrome/tools/convert_dict/BUILD.gn | 1 | ||||
-rw-r--r-- | chromium/chrome/tools/crash_service/caps/caps.gyp | 56 |
3 files changed, 6 insertions, 63 deletions
diff --git a/chromium/chrome/tools/build/repack_locales.py b/chromium/chrome/tools/build/repack_locales.py index 312a52abce8..f5b84dfd47f 100755 --- a/chromium/chrome/tools/build/repack_locales.py +++ b/chromium/chrome/tools/build/repack_locales.py @@ -33,7 +33,6 @@ OS = None CHROMEOS = False USE_ASH = False -ENABLE_AUTOFILL_DIALOG = False ENABLE_EXTENSIONS = False WHITELIST = None @@ -126,6 +125,11 @@ def calc_inputs(locale): inputs.append(os.path.join(SHARE_INT_DIR, 'ui', 'strings', 'app_locale_settings_%s.pak' % locale)) + #e.g. '<(SHARED_INTERMEDIATE_DIR)/third_party/libaddressinput/ + # address_input_strings_da.pak', + inputs.append(os.path.join(SHARE_INT_DIR, 'third_party', 'libaddressinput', + 'address_input_strings_%s.pak' % locale)) + else: #e.g. '<(SHARED_INTERMEDIATE_DIR)/ios/chrome/ios_locale_settings_da.pak' inputs.append(os.path.join(SHARE_INT_DIR, 'ios', 'chrome', @@ -141,12 +145,6 @@ def calc_inputs(locale): inputs.append(os.path.join(SHARE_INT_DIR, 'ios', 'chrome', 'ios_%s_strings_%s.pak' % (BRANDING, locale))) - if ENABLE_AUTOFILL_DIALOG: - #e.g. '<(SHARED_INTERMEDIATE_DIR)/third_party/libaddressinput/ - # address_input_strings_da.pak', - inputs.append(os.path.join(SHARE_INT_DIR, 'third_party', 'libaddressinput', - 'address_input_strings_%s.pak' % locale)) - if ENABLE_EXTENSIONS: # For example: # '<(SHARED_INTERMEDIATE_DIR)/extensions/strings/extensions_strings_da.pak diff --git a/chromium/chrome/tools/convert_dict/BUILD.gn b/chromium/chrome/tools/convert_dict/BUILD.gn index c4b42ce830f..9358e108f0c 100644 --- a/chromium/chrome/tools/convert_dict/BUILD.gn +++ b/chromium/chrome/tools/convert_dict/BUILD.gn @@ -34,6 +34,7 @@ executable("convert_dict") { "//base", "//base:i18n", "//build/config/sanitizers:deps", + "//build/win:default_exe_manifest", "//third_party/hunspell", ] } diff --git a/chromium/chrome/tools/crash_service/caps/caps.gyp b/chromium/chrome/tools/crash_service/caps/caps.gyp deleted file mode 100644 index ce1e22f071e..00000000000 --- a/chromium/chrome/tools/crash_service/caps/caps.gyp +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 2015 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, - }, - 'includes': [ - '../../../../build/util/version.gypi', - '../../../../build/win_precompile.gypi', - ], - 'targets': [ - { - 'target_name': 'caps_resources', - 'type': 'none', - 'variables': { - 'branding_path': '../../../app/theme/<(branding_path_component)/BRANDING', - 'output_dir': 'caps', - 'template_input_path': '../../../app/chrome_version.rc.version', - }, - 'sources': [ - 'caps.ver', - ], - 'includes': [ - '../../../version_resource_rules.gypi', - ], - }, - { - 'target_name': 'caps', - 'type': 'executable', - 'include_dirs': [ - '..', - ], - 'sources': [ - '<(SHARED_INTERMEDIATE_DIR)/caps/caps_version.rc', - 'exit_codes.h', - 'logger_win.cc', - 'logger_win.h', - 'main_win.cc', - 'process_singleton_win.cc', - 'process_singleton_win.h', - ], - 'dependencies': [ - 'caps_resources', - '../../../../base/base.gyp:base', - '../../../../components/components.gyp:generate_version_info', - ], - 'msvs_settings': { - 'VCLinkerTool': { - # Set /SUBSYSTEM:WINDOWS. - 'SubSystem': '2', - }, - }, - }, - ], -} |