diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-09-18 14:34:04 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-10-04 11:15:27 +0000 |
| commit | e6430e577f105ad8813c92e75c54660c4985026e (patch) | |
| tree | 88115e5d1fb471fea807111924dcccbeadbf9e4f /chromium/ios/public | |
| parent | 53d399fe6415a96ea6986ec0d402a9c07da72453 (diff) | |
| download | qtwebengine-chromium-e6430e577f105ad8813c92e75c54660c4985026e.tar.gz | |
BASELINE: Update Chromium to 61.0.3163.99
Change-Id: I8452f34574d88ca2b27af9bd56fc9ff3f16b1367
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/ios/public')
3 files changed, 3 insertions, 30 deletions
diff --git a/chromium/ios/public/provider/chrome/browser/BUILD.gn b/chromium/ios/public/provider/chrome/browser/BUILD.gn index d28965c507a..fb196d9e403 100644 --- a/chromium/ios/public/provider/chrome/browser/BUILD.gn +++ b/chromium/ios/public/provider/chrome/browser/BUILD.gn @@ -6,6 +6,7 @@ import("//build/buildflag_header.gni") import("//ios/public/provider/chrome/browser/build_config.gni") source_set("browser") { + configs += [ "//build/config/compiler:enable_arc" ] sources = [ "chrome_browser_provider.h", "chrome_browser_provider.mm", @@ -20,6 +21,7 @@ source_set("browser") { } source_set("test_support") { + configs += [ "//build/config/compiler:enable_arc" ] testonly = true sources = [ "test_chrome_browser_provider.h", @@ -32,7 +34,6 @@ source_set("test_support") { "//base", "//ios/public/provider/chrome/browser/distribution:test_support", "//ios/public/provider/chrome/browser/images:test_support", - "//ios/public/provider/chrome/browser/native_app_launcher:test_support", "//ios/public/provider/chrome/browser/omaha:test_support", "//ios/public/provider/chrome/browser/signin:test_support", "//ios/public/provider/chrome/browser/spotlight:test_support", diff --git a/chromium/ios/public/provider/chrome/browser/native_app_launcher/BUILD.gn b/chromium/ios/public/provider/chrome/browser/native_app_launcher/BUILD.gn deleted file mode 100644 index b647bb388d1..00000000000 --- a/chromium/ios/public/provider/chrome/browser/native_app_launcher/BUILD.gn +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 2016 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. - -source_set("native_app_launcher") { - sources = [ - "native_app_metadata.h", - "native_app_types.h", - "native_app_whitelist_manager.h", - ] - configs += [ "//build/config/compiler:enable_arc" ] -} - -source_set("test_support") { - testonly = true - sources = [ - "fake_native_app_metadata.h", - "fake_native_app_metadata.mm", - "fake_native_app_whitelist_manager.h", - "fake_native_app_whitelist_manager.mm", - ] - deps = [ - ":native_app_launcher", - "//base", - "//ios/public/provider/chrome/browser", - "//url", - ] - configs += [ "//build/config/compiler:enable_arc" ] -} diff --git a/chromium/ios/public/provider/chrome/browser/signin/BUILD.gn b/chromium/ios/public/provider/chrome/browser/signin/BUILD.gn index fd8141a2494..88200072400 100644 --- a/chromium/ios/public/provider/chrome/browser/signin/BUILD.gn +++ b/chromium/ios/public/provider/chrome/browser/signin/BUILD.gn @@ -3,6 +3,7 @@ # found in the LICENSE file. source_set("signin") { + configs += [ "//build/config/compiler:enable_arc" ] sources = [ "chrome_identity.h", "chrome_identity.mm", |