diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-03-04 16:24:00 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2022-03-08 13:09:32 +0000 |
commit | 3501323d99ab82023d449a847196c31196b70662 (patch) | |
tree | d1919b64ef31092c5f9bff660adbda8d145c1d38 | |
parent | a2566096b98ebc28a335cf8911310c4a68b0a685 (diff) | |
download | qtwebengine-chromium-3501323d99ab82023d449a847196c31196b70662.tar.gz |
FIXUP: Fix enable_extension=false builds
Change-Id: Ic2355ccf3476fefb0142ded9d4d64d40a9ec9751
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
-rw-r--r-- | chromium/chrome/browser/BUILD.gn | 4 | ||||
-rw-r--r-- | chromium/chrome/test/BUILD.gn | 9 | ||||
-rw-r--r-- | chromium/chrome/test/data/webui/BUILD.gn | 5 |
3 files changed, 8 insertions, 10 deletions
diff --git a/chromium/chrome/browser/BUILD.gn b/chromium/chrome/browser/BUILD.gn index 97b3a19b946..21ebae29336 100644 --- a/chromium/chrome/browser/BUILD.gn +++ b/chromium/chrome/browser/BUILD.gn @@ -6756,10 +6756,12 @@ static_library("browser") { "//components/pdf/browser", "//components/pdf/browser:interceptors", "//components/pdf/common", - "//extensions/common/api", "//pdf:buildflags", "//pdf:features", ] + if (enable_extensions) { + deps += [ "//extensions/common/api" ] + } } if (enable_plugins) { diff --git a/chromium/chrome/test/BUILD.gn b/chromium/chrome/test/BUILD.gn index 69bbbe4c93d..b19868e452b 100644 --- a/chromium/chrome/test/BUILD.gn +++ b/chromium/chrome/test/BUILD.gn @@ -1073,7 +1073,6 @@ if (!is_android && !is_fuchsia) { "//chrome/browser/devtools:test_support", "//chrome/browser/image_decoder:browser_tests", "//chrome/browser/media/router:media_router_feature", - "//chrome/browser/media/router:test_support", "//chrome/browser/metrics:test_support", "//chrome/browser/notifications/scheduler:factory", "//chrome/browser/notifications/scheduler/public", @@ -1387,6 +1386,7 @@ if (!is_android && !is_fuchsia) { if (enable_extensions) { deps += [ "//chrome/browser/extensions:test_support", + "//chrome/browser/media/router:test_support", "//chrome/browser/web_applications:browser_tests", "//chrome/browser/web_applications:web_applications_test_support", "//chrome/browser/web_applications/extensions", @@ -3868,7 +3868,6 @@ if (!is_android && !is_fuchsia) { "../browser/media/webrtc/webrtc_webcam_browsertest.cc", ] deps -= [ - "//chrome/browser/media/router:test_support", ":webrtc_browser_tests_base", ] if (enable_extensions) { @@ -6281,7 +6280,6 @@ test("unit_tests") { "//chrome:packed_resources_integrity_hash", "//chrome/browser:cart_db_content_proto", "//chrome/browser:coupon_db_content_proto", - "//chrome/browser/media/router:test_support", "//chrome/browser/resource_coordinator:intervention_policy_database_proto", "//chrome/browser/resource_coordinator:tab_manager_features", "//chrome/browser/resource_coordinator:tab_metrics_event_proto", @@ -6322,7 +6320,10 @@ test("unit_tests") { deps -= [ "//chrome/browser/media/router:test_support" ] } if (enable_extensions) { - deps += [ "//chrome/browser/web_applications:web_applications_test_support" ] + deps += [ + "//chrome/browser/media/router:test_support", + "//chrome/browser/web_applications:web_applications_test_support", + ] } if (is_chromeos_ash) { deps += [ diff --git a/chromium/chrome/test/data/webui/BUILD.gn b/chromium/chrome/test/data/webui/BUILD.gn index 23c8071b73d..fdf47396754 100644 --- a/chromium/chrome/test/data/webui/BUILD.gn +++ b/chromium/chrome/test/data/webui/BUILD.gn @@ -514,11 +514,6 @@ group("closure_compile") { # TODO(crbug.com/1000989): Add page specific targets here. ] - if (enable_webui_tab_strip) { - deps += [ - "tab_strip:closure_compile", - ] - } if (is_chromeos_ash) { deps += [ "chromeos:closure_compile", |