diff options
author | Michael BrĂ¼ning <michael.bruning@qt.io> | 2019-01-31 17:28:54 +0100 |
---|---|---|
committer | Michael BrĂ¼ning <michael.bruning@qt.io> | 2019-02-01 09:04:02 +0000 |
commit | 5a76a0a325a041dab3c93943c99835d3e9297620 (patch) | |
tree | 7db8512732f7fe1bb1978574c00d587709008021 | |
parent | f708f47083983328c522f0bdf9f163f14b83665a (diff) | |
download | qtwebengine-chromium-5a76a0a325a041dab3c93943c99835d3e9297620.tar.gz |
Fixup non-extensions build on 71-based
Change-Id: I7ce92ba0edc4b196ca05224729d3eb31748a7780
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
-rw-r--r-- | chromium/BUILD.gn | 3 | ||||
-rw-r--r-- | chromium/chrome/browser/BUILD.gn | 2 | ||||
-rw-r--r-- | chromium/chrome/browser/apps/app_shim/BUILD.gn | 10 | ||||
-rw-r--r-- | chromium/chrome/browser/media/router/BUILD.gn | 2 | ||||
-rw-r--r-- | chromium/chrome/browser/profiling_host/BUILD.gn | 8 | ||||
-rw-r--r-- | chromium/chrome/browser/ui/BUILD.gn | 13 | ||||
-rw-r--r-- | chromium/chrome/browser/web_applications/BUILD.gn | 2 | ||||
-rw-r--r-- | chromium/chrome/common/media_router/BUILD.gn | 8 | ||||
-rw-r--r-- | chromium/chrome/test/BUILD.gn | 2 |
9 files changed, 32 insertions, 18 deletions
diff --git a/chromium/BUILD.gn b/chromium/BUILD.gn index 16b0e1228d5..b63cc8e4754 100644 --- a/chromium/BUILD.gn +++ b/chromium/BUILD.gn @@ -1058,8 +1058,7 @@ if (!is_ios && !use_qt) { group("chromium_builder_perf") { testonly = true - - if (!is_ios && !is_android && !is_chromecast && !is_fuchsia) { + if (!is_ios && !is_android && !is_chromecast && !is_fuchsia && !use_qt) { data_deps = [ "//cc:cc_perftests", "//chrome/test:load_library_perf_tests", diff --git a/chromium/chrome/browser/BUILD.gn b/chromium/chrome/browser/BUILD.gn index b6e8ed06776..a94710c88e2 100644 --- a/chromium/chrome/browser/BUILD.gn +++ b/chromium/chrome/browser/BUILD.gn @@ -1672,7 +1672,6 @@ jumbo_split_static_library("browser") { "//chrome/browser/metrics:expired_histograms_array", "//chrome/browser/metrics/variations:chrome_ui_string_overrider_factory", "//chrome/browser/net:probe_message_proto", - "//chrome/browser/profiling_host", "//chrome/browser/push_messaging:budget_proto", "//chrome/browser/resource_coordinator:mojo_bindings", "//chrome/browser/safe_browsing", @@ -3924,6 +3923,7 @@ jumbo_split_static_library("browser") { deps += [ "//apps", "//chrome/browser/sync_file_system/drive_backend:sync_file_system_drive_proto", + "//chrome/browser/profiling_host", "//chrome/browser/web_applications", "//chrome/browser/web_applications/bookmark_apps", "//chrome/browser/web_applications/components", diff --git a/chromium/chrome/browser/apps/app_shim/BUILD.gn b/chromium/chrome/browser/apps/app_shim/BUILD.gn index 19aa43bb16f..16794d0de64 100644 --- a/chromium/chrome/browser/apps/app_shim/BUILD.gn +++ b/chromium/chrome/browser/apps/app_shim/BUILD.gn @@ -20,11 +20,6 @@ source_set("app_shim") { ] deps = [ - "//apps", - "//chrome/browser/apps/platform_apps", - "//chrome/browser/extensions", - "//chrome/browser/web_applications/components", - "//chrome/browser/web_applications/extensions", "//chrome/common", "//chrome/common:app_mode_app_support", "//chrome/common:constants", @@ -44,6 +39,11 @@ source_set("app_shim") { ] deps += [ + "//apps", + "//chrome/browser/apps/platform_apps", + "//chrome/browser/extensions", + "//chrome/browser/web_applications/components", + "//chrome/browser/web_applications/extensions", "//extensions/browser", "//extensions/common", ] diff --git a/chromium/chrome/browser/media/router/BUILD.gn b/chromium/chrome/browser/media/router/BUILD.gn index e707d0b3e82..990310cfdd5 100644 --- a/chromium/chrome/browser/media/router/BUILD.gn +++ b/chromium/chrome/browser/media/router/BUILD.gn @@ -131,7 +131,6 @@ static_library("router") { static_library("test_support") { testonly = true deps = [ - "//chrome/test:test_support", "//testing/gmock", ] public_deps = [ @@ -151,6 +150,7 @@ static_library("test_support") { "discovery", "//chrome/common/media_router/mojo:media_router", "//chrome/common/media_router/mojo:media_router_test_interfaces", + "//chrome/test:test_support", "//extensions/browser", "//extensions/common", ] diff --git a/chromium/chrome/browser/profiling_host/BUILD.gn b/chromium/chrome/browser/profiling_host/BUILD.gn index 9fd1b0b4680..cb8020a0266 100644 --- a/chromium/chrome/browser/profiling_host/BUILD.gn +++ b/chromium/chrome/browser/profiling_host/BUILD.gn @@ -1,7 +1,7 @@ # 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("//extensions/buildflags/buildflags.gni") static_library("profiling_host") { sources = [ "background_profiling_triggers.cc", @@ -37,12 +37,16 @@ if (!is_android) { deps = [ "//base", "//base/allocator:buildflags", - "//chrome/test:test_support_ui", "//components/heap_profiling:test_support", "//components/services/heap_profiling/public/cpp", "//testing/gmock", "//testing/gtest", ] + if (enable_extensions) { + deps += [ + "//chrome/test:test_support_ui", + ] + } } } else { import("//build/config/android/rules.gni") diff --git a/chromium/chrome/browser/ui/BUILD.gn b/chromium/chrome/browser/ui/BUILD.gn index 47d4286b336..c0c8cca8eaa 100644 --- a/chromium/chrome/browser/ui/BUILD.gn +++ b/chromium/chrome/browser/ui/BUILD.gn @@ -2112,11 +2112,16 @@ jumbo_split_static_library("ui") { deps += [ "//chrome/app/nibs:localizer_table", "//chrome/browser/apps/app_shim", - "//extensions/components/native_app_window", "//third_party/google_toolbox_for_mac", "//third_party/mozilla", "//ui/accelerated_widget_mac:accelerated_widget_mac", ] + + if (enable_extensions) { + deps += [ + "//extensions/components/native_app_window", + ] + } include_dirs = [ "$target_gen_dir" ] libs += [ "Carbon.framework", @@ -3665,7 +3670,6 @@ static_library("test_support") { "test/test_confirm_bubble_model.h", ] deps += [ - "//chrome/test:test_support_ui", "//components/signin/core/browser", "//components/ukm:test_support", "//components/zoom", @@ -3684,6 +3688,9 @@ static_library("test_support") { } if (enable_extensions) { - deps += [ "//extensions/browser" ] + deps += [ + "//chrome/test:test_support_ui", + "//extensions/browser", + ] } } diff --git a/chromium/chrome/browser/web_applications/BUILD.gn b/chromium/chrome/browser/web_applications/BUILD.gn index 621fc64de21..f113ee97709 100644 --- a/chromium/chrome/browser/web_applications/BUILD.gn +++ b/chromium/chrome/browser/web_applications/BUILD.gn @@ -1,7 +1,7 @@ # Copyright 2018 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("//extensions/buildflags/buildflags.gni") group("web_app_group") { public_configs = [ "//build/config/compiler:wexit_time_destructors" ] } diff --git a/chromium/chrome/common/media_router/BUILD.gn b/chromium/chrome/common/media_router/BUILD.gn index 1e7ac9c4e19..a1665ea937c 100644 --- a/chromium/chrome/common/media_router/BUILD.gn +++ b/chromium/chrome/common/media_router/BUILD.gn @@ -1,7 +1,7 @@ # 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("//extensions/buildflags/buildflags.gni") static_library("router") { public_deps = [ "//base:base", @@ -55,7 +55,6 @@ static_library("test_support") { testonly = true deps = [ "//base:base", - "//chrome/test:test_support", ] public_deps = [ ":router", @@ -64,4 +63,9 @@ static_library("test_support") { "test/test_helper.cc", "test/test_helper.h", ] + if (enable_extensions) { + deps += [ + "//chrome/test:test_support", + ] + } } diff --git a/chromium/chrome/test/BUILD.gn b/chromium/chrome/test/BUILD.gn index deabc06c628..57f736e8da0 100644 --- a/chromium/chrome/test/BUILD.gn +++ b/chromium/chrome/test/BUILD.gn @@ -1009,7 +1009,6 @@ test("browser_tests") { "//chrome:strings", "//chrome/browser", "//chrome/browser/devtools:test_support", - "//chrome/browser/web_applications:browser_tests", "//chrome/renderer", "//chrome/services/removable_storage_writer:lib", "//components/autofill/content/browser:risk_proto", @@ -3822,6 +3821,7 @@ test("unit_tests") { "../utility/image_writer/image_writer_unittest.cc", ] deps += [ + "//chrome/browser/web_applications:browser_tests", "//chrome/browser/web_applications:unit_tests", "//chrome/common/extensions/api", "//extensions:extensions_resources", |