| Index: chrome/browser/extensions/BUILD.gn
|
| diff --git a/chrome/browser/extensions/BUILD.gn b/chrome/browser/extensions/BUILD.gn
|
| index 1f86812d5e64e68cd450b40b276fc575dd6c7d9f..746382cd7322d3caddffd0e8ccb5636d8b6c5939 100644
|
| --- a/chrome/browser/extensions/BUILD.gn
|
| +++ b/chrome/browser/extensions/BUILD.gn
|
| @@ -8,18 +8,18 @@ import("//build/config/ui.gni")
|
|
|
| assert(enable_extensions)
|
|
|
| -gypi_values = exec_script(
|
| - "//build/gypi_to_gn.py",
|
| - [ rebase_path("../../chrome_browser_extensions.gypi") ],
|
| - "scope",
|
| - [ "../../chrome_browser_extensions.gypi" ])
|
| +gypi_values =
|
| + exec_script("//build/gypi_to_gn.py",
|
| + [ rebase_path("../../chrome_browser_extensions.gypi") ],
|
| + "scope",
|
| + [ "../../chrome_browser_extensions.gypi" ])
|
|
|
| # GYP version: chrome/chrome_browser_extensions.gypi:browser_extensions
|
| static_library("extensions") {
|
| sources = []
|
| - sources += rebase_path(
|
| - gypi_values.chrome_browser_extensions_enabled_sources,
|
| - ".", "//chrome")
|
| + sources += rebase_path(gypi_values.chrome_browser_extensions_enabled_sources,
|
| + ".",
|
| + "//chrome")
|
|
|
| defines = []
|
|
|
| @@ -81,9 +81,10 @@ static_library("extensions") {
|
| ]
|
|
|
| if (is_chromeos) {
|
| - sources += rebase_path(
|
| - gypi_values.chrome_browser_extensions_chromeos_sources,
|
| - ".", "//chrome")
|
| + sources +=
|
| + rebase_path(gypi_values.chrome_browser_extensions_chromeos_sources,
|
| + ".",
|
| + "//chrome")
|
| sources -= [
|
| "api/audio/audio_service_linux.cc",
|
| "api/music_manager_private/device_id_linux.cc",
|
| @@ -98,11 +99,12 @@ static_library("extensions") {
|
| } else {
|
| sources += [
|
| "default_apps.cc",
|
| - "default_apps.h'"
|
| + "default_apps.h'",
|
| ]
|
| - sources += rebase_path(
|
| - gypi_values.chrome_browser_extensions_non_chromeos_sources,
|
| - ".", "//chrome")
|
| + sources +=
|
| + rebase_path(gypi_values.chrome_browser_extensions_non_chromeos_sources,
|
| + ".",
|
| + "//chrome")
|
| }
|
|
|
| if (use_ash) {
|
| @@ -113,22 +115,21 @@ static_library("extensions") {
|
| }
|
| if (use_athena) {
|
| defines += [ USE_ATHENA ]
|
| - sources += rebase_path(
|
| - gypi_values.chrome_browser_extensions_athena_sources,
|
| - ".", "//chrome")
|
| + sources += rebase_path(gypi_values.chrome_browser_extensions_athena_sources,
|
| + ".",
|
| + "//chrome")
|
| } else {
|
| - sources += rebase_path(
|
| - gypi_values.chrome_browser_extensions_non_athena_sources,
|
| - ".", "//chrome")
|
| + sources +=
|
| + rebase_path(gypi_values.chrome_browser_extensions_non_athena_sources,
|
| + ".",
|
| + "//chrome")
|
| }
|
|
|
| if (is_linux) {
|
| configs += [ "//build/config/linux:fontconfig" ]
|
| deps += [ "//dbus" ]
|
| if (use_x11) {
|
| - configs += [
|
| - "//build/config/linux:x11",
|
| - ]
|
| + configs += [ "//build/config/linux:x11" ]
|
| deps += [
|
| "//ui/events:events_base",
|
| "//ui/events/platform",
|
| @@ -136,9 +137,7 @@ static_library("extensions") {
|
| ]
|
| }
|
| } else {
|
| - sources += [
|
| - "api/audio/audio_service.cc",
|
| - ]
|
| + sources += [ "api/audio/audio_service.cc" ]
|
| }
|
|
|
| if (enable_configuration_policy) {
|
| @@ -147,29 +146,25 @@ static_library("extensions") {
|
| "policy_handlers.cc",
|
| "policy_handlers.h",
|
| ]
|
| - sources += rebase_path(
|
| - gypi_values.chrome_browser_extensions_policy_sources,
|
| - ".", "//chrome")
|
| + sources += rebase_path(gypi_values.chrome_browser_extensions_policy_sources,
|
| + ".",
|
| + "//chrome")
|
| }
|
|
|
| if (enable_webrtc) {
|
| - sources += [
|
| - "api/webrtc_logging_private/webrtc_logging_private_api.cc",
|
| - ]
|
| + sources += [ "api/webrtc_logging_private/webrtc_logging_private_api.cc" ]
|
| } else {
|
| - sources += [
|
| - "api/webrtc_logging_private/webrtc_logging_private_api_stub.cc",
|
| - ]
|
| + sources +=
|
| + [ "api/webrtc_logging_private/webrtc_logging_private_api_stub.cc" ]
|
| }
|
|
|
| if (use_brlapi) {
|
| deps += [ "//build/config/linux:libbrlapi" ]
|
| sources += rebase_path(gypi_values.chrome_browser_extensions_brlapi_sources,
|
| - ".", "//chrome")
|
| + ".",
|
| + "//chrome")
|
| } else {
|
| - sources += [
|
| - "api/braille_display_private/braille_controller_stub.cc",
|
| - ]
|
| + sources += [ "api/braille_display_private/braille_controller_stub.cc" ]
|
| }
|
|
|
| if (use_aura) {
|
| @@ -197,14 +192,16 @@ static_library("extensions") {
|
| if (is_win || is_mac) {
|
| deps += [ "//components/wifi" ]
|
| sources += rebase_path(
|
| - gypi_values.chrome_browser_extensions_networking_private_sources_winmac,
|
| - ".", "//chrome")
|
| + gypi_values.chrome_browser_extensions_networking_private_sources_winmac,
|
| + ".",
|
| + "//chrome")
|
| }
|
|
|
| if (is_desktop_linux) {
|
| sources += rebase_path(
|
| - gypi_values.chrome_browser_extensions_networking_private_sources_linux,
|
| - ".", "//chrome")
|
| + gypi_values.chrome_browser_extensions_networking_private_sources_linux,
|
| + ".",
|
| + "//chrome")
|
| }
|
|
|
| if (is_win) {
|
| @@ -220,19 +217,16 @@ static_library("extensions") {
|
| }
|
|
|
| if (enable_app_list) {
|
| - sources += rebase_path(
|
| - gypi_values.chrome_browser_extensions_app_list_sources,
|
| - ".", "//chrome")
|
| + sources +=
|
| + rebase_path(gypi_values.chrome_browser_extensions_app_list_sources,
|
| + ".",
|
| + "//chrome")
|
| }
|
|
|
| if (is_chromeos && use_ozone) {
|
| - sources -= [
|
| - "global_shortcut_listener_chromeos.cc",
|
| - ]
|
| + sources -= [ "global_shortcut_listener_chromeos.cc" ]
|
| }
|
| if (!use_ozone) {
|
| - sources -= [
|
| - "global_shortcut_listener_ozone.cc",
|
| - ]
|
| + sources -= [ "global_shortcut_listener_ozone.cc" ]
|
| }
|
| }
|
|
|