Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(603)

Unified Diff: chrome/browser/extensions/BUILD.gn

Issue 2209843002: Expand scope of enable_hotwording. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: import Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/BUILD.gn ('k') | chrome/common/features.gni » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/BUILD.gn
diff --git a/chrome/browser/extensions/BUILD.gn b/chrome/browser/extensions/BUILD.gn
index 0000525f551df92f7f28ad73327064df6f87628e..24683ed4c41e32574d948d130818c10a7d9095b0 100644
--- a/chrome/browser/extensions/BUILD.gn
+++ b/chrome/browser/extensions/BUILD.gn
@@ -4,6 +4,7 @@
import("//build/config/features.gni")
import("//build/config/ui.gni")
+import("//chrome/common/features.gni")
assert(enable_extensions)
@@ -108,13 +109,6 @@ static_library("extensions") {
"//url",
]
- if (enable_task_manager) {
- sources += rebase_path(
- gypi_values.chrome_browser_extensions_task_manager_enabled_sources,
- ".",
- "//chrome")
- }
-
if (is_chromeos) {
sources +=
rebase_path(gypi_values.chrome_browser_extensions_chromeos_sources,
@@ -140,31 +134,19 @@ static_library("extensions") {
"//chrome")
}
- if (enable_service_discovery) {
- sources += rebase_path(
- gypi_values.chrome_browser_extensions_service_discovery_sources,
- ".",
- "//chrome")
- }
-
- if (use_ash) {
- sources += [
- "api/tabs/ash_panel_contents.cc",
- "api/tabs/ash_panel_contents.h",
+ # chromeos uses its own global_shortcut_listener, _x11 is not necessary.
+ if (is_chromeos || !use_x11) {
+ sources -= [
+ "global_shortcut_listener_x11.cc",
+ "global_shortcut_listener_x11.h",
]
- deps += [ "//ash" ]
}
- if (use_aura) {
- deps += [
- "//ui/keyboard",
- "//ui/keyboard:keyboard_with_content",
- "//ui/keyboard:resources",
- ]
+ if (is_chromeos && use_ozone) {
+ sources -= [ "global_shortcut_listener_chromeos.cc" ]
}
-
- if (toolkit_views) {
- deps += [ "//ui/views" ]
+ if (!use_ozone) {
+ sources -= [ "global_shortcut_listener_ozone.cc" ]
}
if (is_linux) {
@@ -190,30 +172,6 @@ static_library("extensions") {
}
}
- if (enable_webrtc) {
- sources += [ "api/webrtc_logging_private/webrtc_logging_private_api.cc" ]
- } else {
- sources +=
- [ "api/webrtc_logging_private/webrtc_logging_private_api_stub.cc" ]
- }
-
- if (use_brlapi) {
- deps += [ "//build/linux/libbrlapi" ]
- sources += rebase_path(gypi_values.chrome_browser_extensions_brlapi_sources,
- ".",
- "//chrome")
- } else {
- sources += [ "api/braille_display_private/braille_controller_stub.cc" ]
- }
-
- # chromeos uses its own global_shortcut_listener, _x11 is not necessary.
- if (is_chromeos || !use_x11) {
- sources -= [
- "global_shortcut_listener_x11.cc",
- "global_shortcut_listener_x11.h",
- ]
- }
-
if (is_win || is_mac) {
deps += [ "//components/wifi" ]
sources += rebase_path(
@@ -245,10 +203,57 @@ static_library("extensions") {
"//chrome")
}
- if (is_chromeos && use_ozone) {
- sources -= [ "global_shortcut_listener_chromeos.cc" ]
+ if (enable_hotwording) {
+ defines += [ "ENABLE_HOTWORDING" ]
}
- if (!use_ozone) {
- sources -= [ "global_shortcut_listener_ozone.cc" ]
+
+ if (enable_service_discovery) {
+ sources += rebase_path(
+ gypi_values.chrome_browser_extensions_service_discovery_sources,
+ ".",
+ "//chrome")
+ }
+
+ if (enable_task_manager) {
+ sources += rebase_path(
+ gypi_values.chrome_browser_extensions_task_manager_enabled_sources,
+ ".",
+ "//chrome")
+ }
+
+ if (enable_webrtc) {
+ sources += [ "api/webrtc_logging_private/webrtc_logging_private_api.cc" ]
+ } else {
+ sources +=
+ [ "api/webrtc_logging_private/webrtc_logging_private_api_stub.cc" ]
+ }
+
+ if (toolkit_views) {
+ deps += [ "//ui/views" ]
+ }
+
+ if (use_ash) {
+ sources += [
+ "api/tabs/ash_panel_contents.cc",
+ "api/tabs/ash_panel_contents.h",
+ ]
+ deps += [ "//ash" ]
+ }
+
+ if (use_aura) {
+ deps += [
+ "//ui/keyboard",
+ "//ui/keyboard:keyboard_with_content",
+ "//ui/keyboard:resources",
+ ]
+ }
+
+ if (use_brlapi) {
+ deps += [ "//build/linux/libbrlapi" ]
+ sources += rebase_path(gypi_values.chrome_browser_extensions_brlapi_sources,
+ ".",
+ "//chrome")
+ } else {
+ sources += [ "api/braille_display_private/braille_controller_stub.cc" ]
}
}
« no previous file with comments | « chrome/browser/BUILD.gn ('k') | chrome/common/features.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698