From 6ec7b8da05d21a3878bd21c691b41e675d74bb1c Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Mon, 17 Jul 2017 13:57:45 +0200 Subject: BASELINE: Update Chromium to 60.0.3112.70 Change-Id: I9911c2280a014d4632f254857876a395d4baed2d Reviewed-by: Alexandru Croitor --- chromium/chrome/installer/gcapi_mac/BUILD.gn | 48 +++++++++++++++++++++++ chromium/chrome/installer/linux/BUILD.gn | 12 ------ chromium/chrome/installer/mac/BUILD.gn | 1 + chromium/chrome/installer/mini_installer/BUILD.gn | 2 +- chromium/chrome/installer/setup/BUILD.gn | 2 +- chromium/chrome/installer/test/BUILD.gn | 2 +- chromium/chrome/installer/util/BUILD.gn | 3 ++ 7 files changed, 55 insertions(+), 15 deletions(-) create mode 100644 chromium/chrome/installer/gcapi_mac/BUILD.gn (limited to 'chromium/chrome/installer') diff --git a/chromium/chrome/installer/gcapi_mac/BUILD.gn b/chromium/chrome/installer/gcapi_mac/BUILD.gn new file mode 100644 index 00000000000..dd1103bd284 --- /dev/null +++ b/chromium/chrome/installer/gcapi_mac/BUILD.gn @@ -0,0 +1,48 @@ +# Copyright 2017 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/sysroot.gni") + +assert(is_mac) + +config("gcapi_config") { + cflags = [ + "-isysroot", + sysroot, + "-mmacosx-version-min=10.5", + ] + ldflags = [ + "-isysroot", + sysroot, + "-mmacosx-version-min=10.5", + ] +} + +static_library("gcapi_lib") { + complete_static_lib = true + sources = [ + "gcapi.h", + "gcapi.mm", + ] + + libs = [ "Cocoa.framework" ] + + # Don't use runtime_library, to be able to pick a custom mmacosx-version-min. + configs -= [ "//build/config/compiler:runtime_library" ] + configs += [ ":gcapi_config" ] +} + +executable("gcapi_example") { + sources = [ + "gcapi_example_client.mm", + ] + + deps = [ + ":gcapi_lib", + ] + + # Don't use runtime_library, to be able to pick a custom mmacosx-version-min. + configs -= [ "//build/config/compiler:runtime_library" ] + configs += [ ":gcapi_config" ] +} diff --git a/chromium/chrome/installer/linux/BUILD.gn b/chromium/chrome/installer/linux/BUILD.gn index 9e5dafbcd95..d8fd944ab6b 100644 --- a/chromium/chrome/installer/linux/BUILD.gn +++ b/chromium/chrome/installer/linux/BUILD.gn @@ -50,18 +50,6 @@ group("linux") { ] } -# This target is provided for compatibility w/ GYP. Users should always -# depend directly on :linux instead of this target (we set visibility -# to the empty list to prevent unwanted callers). -# TODO(GYP_GONE): Delete this target after we've migrated away from GYP and -# updated the bots to build :linux instead. -group("linux_packages_all") { - visibility = [] - deps = [ - ":linux", - ] -} - branding_dir = "//chrome/app/theme/$branding_path_component" branding_dir_100 = "//chrome/app/theme/default_100_percent/$branding_path_component" diff --git a/chromium/chrome/installer/mac/BUILD.gn b/chromium/chrome/installer/mac/BUILD.gn index 846e9bd464c..d6ad7cf1323 100644 --- a/chromium/chrome/installer/mac/BUILD.gn +++ b/chromium/chrome/installer/mac/BUILD.gn @@ -71,6 +71,7 @@ copy("copies") { "dmgdiffer.sh", "pkg-dmg", "sign_installer_tools.sh", + "variables.sh", ] if (is_chrome_branded) { diff --git a/chromium/chrome/installer/mini_installer/BUILD.gn b/chromium/chrome/installer/mini_installer/BUILD.gn index 5d2fe25007f..2afab1a3c6a 100644 --- a/chromium/chrome/installer/mini_installer/BUILD.gn +++ b/chromium/chrome/installer/mini_installer/BUILD.gn @@ -257,7 +257,7 @@ template("generate_mini_installer") { ":$archive_name", ":lib", ":version", - "//build/config/sanitizers:deps", + "//build/config:exe_and_shlib_deps", "//build/win:default_exe_manifest", ] } diff --git a/chromium/chrome/installer/setup/BUILD.gn b/chromium/chrome/installer/setup/BUILD.gn index 34f5b77d99d..6bf0d0bfe69 100644 --- a/chromium/chrome/installer/setup/BUILD.gn +++ b/chromium/chrome/installer/setup/BUILD.gn @@ -24,7 +24,7 @@ if (is_win) { deps = [ ":lib", ":setup_exe_version", - "//build/config/sanitizers:deps", + "//build/config:exe_and_shlib_deps", "//build/win:default_exe_manifest", "//chrome/install_static:install_static_util", "//components/crash/content/app:app", diff --git a/chromium/chrome/installer/test/BUILD.gn b/chromium/chrome/installer/test/BUILD.gn index c91c65f736a..1ee05526cdf 100644 --- a/chromium/chrome/installer/test/BUILD.gn +++ b/chromium/chrome/installer/test/BUILD.gn @@ -16,7 +16,7 @@ executable("alternate_version_generator") { ":alternate_version_generator_lib", "//base", "//base/test:test_support", - "//build/config/sanitizers:deps", + "//build/config:exe_and_shlib_deps", "//build/win:default_exe_manifest", "//chrome/common:constants", "//chrome/installer/util:with_rc_strings", diff --git a/chromium/chrome/installer/util/BUILD.gn b/chromium/chrome/installer/util/BUILD.gn index 8d04ce75b23..ca2c3f1646f 100644 --- a/chromium/chrome/installer/util/BUILD.gn +++ b/chromium/chrome/installer/util/BUILD.gn @@ -57,6 +57,8 @@ static_library("with_no_strings") { "chrome_browser_operations.h", "delete_after_reboot_helper.cc", "delete_after_reboot_helper.h", + "experiment_labels.cc", + "experiment_labels.h", "google_chrome_distribution.cc", "google_chrome_distribution.h", "html_dialog.h", @@ -289,6 +291,7 @@ if (is_win) { "delete_reg_value_work_item_unittest.cc", "delete_tree_work_item_unittest.cc", "duplicate_tree_detector_unittest.cc", + "experiment_labels_unittest.cc", "google_update_settings_unittest.cc", "install_util_unittest.cc", "installer_util_test_common.cc", -- cgit v1.2.1