From 68b31cb2811ac1ff57f6cd756cbbe3c169a732e7 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Fri, 9 Jul 2021 16:29:34 +0200 Subject: Fix enable_extension=false builds Too aggresive inclusions Change-Id: Ifd9457ae59a8c7fe15cc3c3967e3332db2798679 Reviewed-by: Michal Klocek --- chromium/chrome/browser/BUILD.gn | 1 - chromium/chrome/browser/devtools/BUILD.gn | 2 +- chromium/chrome/browser/ui/BUILD.gn | 1 - chromium/chrome/browser/web_applications/BUILD.gn | 2 ++ chromium/chrome/test/BUILD.gn | 12 ++++++++++-- 5 files changed, 13 insertions(+), 5 deletions(-) diff --git a/chromium/chrome/browser/BUILD.gn b/chromium/chrome/browser/BUILD.gn index 8d087e87e01..96962b88df3 100644 --- a/chromium/chrome/browser/BUILD.gn +++ b/chromium/chrome/browser/BUILD.gn @@ -4192,7 +4192,6 @@ static_library("browser") { "//chrome/browser/resource_coordinator/tab_ranker", "//chrome/browser/resources:component_extension_resources", "//chrome/browser/ui/color:color_headers", - "//chrome/browser/web_applications/components", "//chrome/common/cart:mojo_bindings", "//chrome/common/importer:interfaces", "//chrome/common/search:generate_chrome_colors_info", diff --git a/chromium/chrome/browser/devtools/BUILD.gn b/chromium/chrome/browser/devtools/BUILD.gn index 61a0de2bd9b..bc246220627 100644 --- a/chromium/chrome/browser/devtools/BUILD.gn +++ b/chromium/chrome/browser/devtools/BUILD.gn @@ -113,7 +113,7 @@ static_library("devtools") { "//ui/events:dom_keycode_converter", ] - if (!is_android) { + if (!is_android && !use_qt) { deps += [ "//build:chromeos_buildflags", "//chrome:extra_resources", diff --git a/chromium/chrome/browser/ui/BUILD.gn b/chromium/chrome/browser/ui/BUILD.gn index deba3f079d3..aca7246238c 100644 --- a/chromium/chrome/browser/ui/BUILD.gn +++ b/chromium/chrome/browser/ui/BUILD.gn @@ -1588,7 +1588,6 @@ static_library("ui") { "//chrome/browser/ui/webui/app_management:mojo_bindings", "//chrome/browser/ui/webui/internals/user_education:mojo_bindings", "//chrome/browser/ui/webui/internals/web_app:mojo_bindings", - "//chrome/browser/web_applications/components", "//chrome/common:buildflags", "//chrome/common/search:generate_chrome_colors_info", "//chrome/common/search:mojo_bindings", diff --git a/chromium/chrome/browser/web_applications/BUILD.gn b/chromium/chrome/browser/web_applications/BUILD.gn index cec3c050a52..ee066254329 100644 --- a/chromium/chrome/browser/web_applications/BUILD.gn +++ b/chromium/chrome/browser/web_applications/BUILD.gn @@ -5,6 +5,8 @@ import("//build/config/chromeos/ui_mode.gni") import("//extensions/buildflags/buildflags.gni") +assert(enable_extensions) + group("web_app_group") { public_configs = [ "//build/config/compiler:wexit_time_destructors" ] } diff --git a/chromium/chrome/test/BUILD.gn b/chromium/chrome/test/BUILD.gn index 38f4e569611..a4f9a476cff 100644 --- a/chromium/chrome/test/BUILD.gn +++ b/chromium/chrome/test/BUILD.gn @@ -918,7 +918,6 @@ if (!is_android) { "//chrome/browser/payments:browser_tests", "//chrome/browser/privacy_budget:browser_tests", "//chrome/browser/profiling_host:profiling_browsertests", - "//chrome/browser/web_applications:browser_tests", "//chrome/renderer", "//chrome/services/removable_storage_writer:lib", "//chrome/test/data:webui_test_resources", @@ -1047,6 +1046,11 @@ if (!is_android) { "//ui/webui/resources/js/cr/ui:modulize_runtime_data", ] + if (enable_extensions) { + deps += [ + "//chrome/browser/web_applications:browser_tests", + ] + } if (!is_component_build) { # WebRTC's frame_analyzer doesn't build correctly on component builds, # because some compilers will get confused by the fact that WebRTC @@ -7041,7 +7045,6 @@ if (!is_android) { "//chrome/browser/devtools", "//chrome/browser/devtools:test_support", "//chrome/browser/resource_coordinator:tab_metrics_event_proto", - "//chrome/browser/web_applications:web_applications_test_support", "//chrome/renderer", "//components/enterprise:test_support", "//components/feature_engagement/test:test_support", @@ -7078,6 +7081,11 @@ if (!is_android) { "//ui/web_dialogs:test_support", ] + if (enable_extensions) { + deps += [ + "//chrome/browser/web_applications:web_applications_test_support", + ] + } if (include_js_tests) { deps += [ "//chrome/test/data/webui:interactive_ui_tests_js_mojo_lite_webui", -- cgit v1.2.1