gn format //chrome
No intended functionality change.
[email protected]
BUG=348474
Review URL: https://codereview.chromium.org/754223003
Cr-Commit-Position: refs/heads/master@{#306670}
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index 60209f9..446bf33 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -6,6 +6,7 @@
import("//build/config/features.gni")
import("//build/config/ui.gni")
import("//components/nacl/nacl_defines.gni")
+
# //build/config/android/rules.gni imports //tools/grit/grit_rule.gni, which
# produces a conflict for the "grit" template so we have to only include one.
if (is_android) {
@@ -21,11 +22,10 @@
additional_modules_list_file =
"$root_gen_dir/chrome/browser/internal/additional_modules_list.txt"
-gypi_values = exec_script(
- "//build/gypi_to_gn.py",
- [ rebase_path("../chrome_browser.gypi") ],
- "scope",
- [ "../chrome_browser.gypi" ])
+gypi_values = exec_script("//build/gypi_to_gn.py",
+ [ rebase_path("../chrome_browser.gypi") ],
+ "scope",
+ [ "../chrome_browser.gypi" ])
if (is_desktop_linux) {
pkg_config("gnome_keyring") {
@@ -146,44 +146,53 @@
"//ui/resources",
]
- sources += rebase_path(gypi_values.chrome_browser_undo_sources,
- ".", "//chrome")
+ sources +=
+ rebase_path(gypi_values.chrome_browser_undo_sources, ".", "//chrome")
if (!is_ios) {
- sources += rebase_path(gypi_values.chrome_browser_non_ios_sources,
- ".", "//chrome")
+ sources +=
+ rebase_path(gypi_values.chrome_browser_non_ios_sources, ".", "//chrome")
sources += rebase_path(gypi_values.chrome_browser_autocomplete_sources,
- ".", "//chrome")
+ ".",
+ "//chrome")
sources += rebase_path(gypi_values.chrome_browser_bookmark_sources,
- ".", "//chrome")
- sources += rebase_path(gypi_values.chrome_browser_favicon_sources,
- ".", "//chrome")
- sources += rebase_path(gypi_values.chrome_browser_google_sources,
- ".", "//chrome")
- sources += rebase_path(gypi_values.chrome_browser_history_sources,
- ".", "//chrome")
- sources += rebase_path(gypi_values.chrome_browser_metrics_sources,
- ".", "//chrome")
- sources += rebase_path(gypi_values.chrome_browser_net_sources,
- ".", "//chrome")
+ ".",
+ "//chrome")
+ sources +=
+ rebase_path(gypi_values.chrome_browser_favicon_sources, ".", "//chrome")
+ sources +=
+ rebase_path(gypi_values.chrome_browser_google_sources, ".", "//chrome")
+ sources +=
+ rebase_path(gypi_values.chrome_browser_history_sources, ".", "//chrome")
+ sources +=
+ rebase_path(gypi_values.chrome_browser_metrics_sources, ".", "//chrome")
+ sources +=
+ rebase_path(gypi_values.chrome_browser_net_sources, ".", "//chrome")
sources += rebase_path(gypi_values.chrome_browser_password_manager_sources,
- ".", "//chrome")
+ ".",
+ "//chrome")
sources += rebase_path(gypi_values.chrome_browser_predictor_sources,
- ".", "//chrome")
- sources += rebase_path(gypi_values.chrome_browser_pref_sources,
- ".", "//chrome")
+ ".",
+ "//chrome")
+ sources +=
+ rebase_path(gypi_values.chrome_browser_pref_sources, ".", "//chrome")
sources += rebase_path(gypi_values.chrome_browser_profiles_sources,
- ".", "//chrome")
+ ".",
+ "//chrome")
sources += rebase_path(gypi_values.chrome_browser_search_engines_sources,
- ".", "//chrome")
+ ".",
+ "//chrome")
sources += rebase_path(gypi_values.chrome_browser_services_sources,
- ".", "//chrome")
- sources += rebase_path(gypi_values.chrome_browser_signin_sources,
- ".", "//chrome")
- sources += rebase_path(gypi_values.chrome_browser_sync_sources,
- ".", "//chrome")
+ ".",
+ "//chrome")
+ sources +=
+ rebase_path(gypi_values.chrome_browser_signin_sources, ".", "//chrome")
+ sources +=
+ rebase_path(gypi_values.chrome_browser_sync_sources, ".", "//chrome")
sources += rebase_path(gypi_values.chrome_browser_web_resource_sources,
- ".", "//chrome")
+ ".",
+ "//chrome")
+
#TODO(GYP) Add these sources:
# # These files are generated by GRIT.
# '<(grit_out_dir)/grit/component_extension_resources_map.cc',
@@ -241,29 +250,31 @@
"//ui/surface",
"//ui/web_dialogs",
"//v8",
+
## TODO(tonyg): Remove this dependency (crbug.com/280157).
#"../testing/perf/perf_test.gyp:*", TODO(GYP)
]
} else { # iOS
- sources += rebase_path(gypi_values.chrome_browser_ios_sources,
- ".", "//chrome")
- sources += rebase_path(gypi_values.chrome_browser_google_sources,
- ".", "//chrome")
- deps += [
- "//net",
- ]
+ sources +=
+ rebase_path(gypi_values.chrome_browser_ios_sources, ".", "//chrome")
+ sources +=
+ rebase_path(gypi_values.chrome_browser_google_sources, ".", "//chrome")
+ deps += [ "//net" ]
libs += [
"CoreTelephony.framework",
"CoreText.framework",
"MobileCoreServices.framework",
"QuartzCore.framework",
]
- ldflags += [ "-weak_framework", "CoreImage" ]
+ ldflags += [
+ "-weak_framework",
+ "CoreImage",
+ ]
}
if (is_win || is_mac) {
- sources += rebase_path(gypi_values.chrome_browser_win_mac_sources,
- ".", "//chrome")
+ sources +=
+ rebase_path(gypi_values.chrome_browser_win_mac_sources, ".", "//chrome")
}
if (!is_android && !is_ios && !is_chromeos && enable_configuration_policy) {
sources += [
@@ -278,8 +289,8 @@
]
}
if (is_mac) {
- sources += rebase_path(gypi_values.chrome_browser_mac_sources,
- ".", "//chrome")
+ sources +=
+ rebase_path(gypi_values.chrome_browser_mac_sources, ".", "//chrome")
deps += [
#"app_shim" TODO(GYP)
#"browser_app_shim" TODO(GYP)
@@ -294,11 +305,13 @@
"//extensions/components/javascript_dialog_extensions_client",
]
sources += rebase_path(gypi_values.chrome_browser_extensions_sources,
- ".", "//chrome")
+ ".",
+ "//chrome")
}
if (enable_background) {
sources += rebase_path(gypi_values.chrome_browser_background_sources,
- ".", "//chrome")
+ ".",
+ "//chrome")
if (!use_aura || is_win || is_chromeos) {
sources -= [ "background/background_mode_manager_aura.cc" ]
}
@@ -306,58 +319,63 @@
}
if (enable_task_manager) {
sources += rebase_path(gypi_values.chrome_browser_task_manager_sources,
- ".", "//chrome")
+ ".",
+ "//chrome")
}
if (enable_spellcheck) {
sources += rebase_path(gypi_values.chrome_browser_spellchecker_sources,
- ".", "//chrome")
+ ".",
+ "//chrome")
deps += [ "//third_party/hunspell" ]
}
if (enable_nacl) {
- sources += rebase_path(gypi_values.chrome_browser_nacl_sources,
- ".", "//chrome")
+ sources +=
+ rebase_path(gypi_values.chrome_browser_nacl_sources, ".", "//chrome")
#deps += [ "//components/nacl:nacl_browser" ] TODO(GYP)
}
if (enable_configuration_policy) {
- sources += rebase_path(
- gypi_values.chrome_browser_policy_shared_with_ios_sources,
- ".", "//chrome")
+ sources +=
+ rebase_path(gypi_values.chrome_browser_policy_shared_with_ios_sources,
+ ".",
+ "//chrome")
deps += [
"//components/policy",
"//components/policy/proto",
]
if (!is_ios) {
- sources += rebase_path(
- gypi_values.chrome_browser_policy_non_ios_sources,
- ".", "//chrome")
+ sources += rebase_path(gypi_values.chrome_browser_policy_non_ios_sources,
+ ".",
+ "//chrome")
}
if (!is_chromeos) {
sources += rebase_path(
- gypi_values.chrome_browser_policy_shared_with_ios_not_chromeos_sources,
- ".", "//chrome")
+ gypi_values.chrome_browser_policy_shared_with_ios_not_chromeos_sources,
+ ".",
+ "//chrome")
}
if (is_win || is_mac || is_desktop_linux) {
sources += rebase_path(gypi_values.chrome_browser_policy_desktop_sources,
- ".", "//chrome")
+ ".",
+ "//chrome")
}
if (is_android || is_ios) {
sources += rebase_path(gypi_values.chrome_browser_policy_mobile_sources,
- ".", "//chrome")
+ ".",
+ "//chrome")
} else {
- deps += [
- "//chrome/browser/policy:path_parser",
- ]
+ deps += [ "//chrome/browser/policy:path_parser" ]
}
} else {
# Configuration policy disabled.
sources += rebase_path(gypi_values.chrome_browser_policy_disabled_sources,
- ".", "//chrome")
+ ".",
+ "//chrome")
}
if (enable_plugins) {
- sources += rebase_path(gypi_values.chrome_browser_plugins_sources,
- ".", "//chrome")
+ sources +=
+ rebase_path(gypi_values.chrome_browser_plugins_sources, ".", "//chrome")
deps += [
"//components/pdf/browser",
"//ppapi:ppapi_ipc",
@@ -365,22 +383,22 @@
]
}
if (safe_browsing_mode != 0) {
- sources += rebase_path(
- gypi_values.chrome_browser_basic_safe_browsing_sources,
- ".", "//chrome")
+ sources +=
+ rebase_path(gypi_values.chrome_browser_basic_safe_browsing_sources,
+ ".",
+ "//chrome")
deps += [
"//chrome/browser/safe_browsing:chunk_proto",
"//chrome/browser/safe_browsing:metadata_proto",
"//chrome/browser/safe_browsing:report_proto",
]
if (safe_browsing_mode == 1) {
- sources += rebase_path(
- gypi_values.chrome_browser_full_safe_browsing_sources,
- ".", "//chrome")
+ sources +=
+ rebase_path(gypi_values.chrome_browser_full_safe_browsing_sources,
+ ".",
+ "//chrome")
defines += [ "FULL_SAFE_BROWSING" ]
- deps += [
- "//chrome/common/safe_browsing:proto",
- ]
+ deps += [ "//chrome/common/safe_browsing:proto" ]
} else if (safe_browsing_mode == 2) {
defines += [ "MOBILE_SAFE_BROWSING" ]
}
@@ -389,7 +407,7 @@
if (is_linux) {
deps += [
"//device/media_transfer_protocol",
- "//device/udev_linux"
+ "//device/udev_linux",
]
}
if (is_linux && !is_chromeos) {
@@ -398,14 +416,14 @@
if (is_chromeos) {
sources += rebase_path(gypi_values.chrome_browser_chromeos_sources,
- ".", "//chrome")
- deps += [
- "//chrome/browser/chromeos",
- ]
+ ".",
+ "//chrome")
+ deps += [ "//chrome/browser/chromeos" ]
} else {
# Non-ChromeOS.
sources += rebase_path(gypi_values.chrome_browser_non_chromeos_sources,
- ".", "//chrome")
+ ".",
+ "//chrome")
}
if (is_chromeos || is_ios) {
@@ -420,12 +438,13 @@
}
if (is_desktop_linux) {
sources += rebase_path(gypi_values.chrome_browser_gnome_keyring_sources,
- ".", "//chrome")
+ ".",
+ "//chrome")
configs += [ ":gnome_keyring" ]
}
if (use_aura) {
- sources += rebase_path(gypi_values.chrome_browser_aura_sources,
- ".", "//chrome")
+ sources +=
+ rebase_path(gypi_values.chrome_browser_aura_sources, ".", "//chrome")
deps += [
"//ui/aura",
"//ui/compositor",
@@ -437,13 +456,13 @@
}
if (use_ash) {
- sources += rebase_path(gypi_values.chrome_browser_ash_sources,
- ".", "//chrome")
+ sources +=
+ rebase_path(gypi_values.chrome_browser_ash_sources, ".", "//chrome")
}
if (use_x11) {
- sources += rebase_path(gypi_values.chrome_browser_x11_sources,
- ".", "//chrome")
+ sources +=
+ rebase_path(gypi_values.chrome_browser_x11_sources, ".", "//chrome")
if (!is_chromeos) {
configs += [ "//build/config/linux:xscrnsaver" ]
}
@@ -459,70 +478,77 @@
]
}
if (use_nss_certs) {
- sources += rebase_path(gypi_values.chrome_browser_nss_sources,
- ".", "//chrome")
+ sources +=
+ rebase_path(gypi_values.chrome_browser_nss_sources, ".", "//chrome")
if (is_chromeos) {
sources -= [ "net/nss_context_linux.cc" ]
}
}
if (enable_notifications) {
sources += rebase_path(gypi_values.chrome_browser_notifications_sources,
- ".", "//chrome")
+ ".",
+ "//chrome")
if (!is_android) {
sources += rebase_path(
- gypi_values.chrome_browser_non_android_notifications_sources,
- ".", "//chrome")
+ gypi_values.chrome_browser_non_android_notifications_sources,
+ ".",
+ "//chrome")
}
}
if (enable_themes) {
- sources += rebase_path(gypi_values.chrome_browser_themes_sources,
- ".", "//chrome")
+ sources +=
+ rebase_path(gypi_values.chrome_browser_themes_sources, ".", "//chrome")
}
if (enable_basic_printing || enable_print_preview) {
# Some form of printing support.
sources += rebase_path(gypi_values.chrome_browser_basic_printing_sources,
- ".", "//chrome")
- deps += [
- "//printing",
- ]
+ ".",
+ "//chrome")
+ deps += [ "//printing" ]
if (is_win) {
sources += rebase_path(gypi_values.chrome_browser_printing_emf_sources,
- ".", "//chrome")
+ ".",
+ "//chrome")
}
if (enable_print_preview) {
# Full printing on top of the above.
sources += rebase_path(gypi_values.chrome_browser_full_printing_sources,
- ".", "//chrome")
+ ".",
+ "//chrome")
} else {
# Partial-only printing support.
- sources += rebase_path(
- gypi_values.chrome_browser_basic_only_printing_sources,
- ".", "//chrome")
+ sources +=
+ rebase_path(gypi_values.chrome_browser_basic_only_printing_sources,
+ ".",
+ "//chrome")
}
}
if (enable_captive_portal_detection) {
sources += rebase_path(gypi_values.chrome_browser_captive_portal_sources,
- ".", "//chrome")
+ ".",
+ "//chrome")
}
if (enable_session_service) {
sources += rebase_path(gypi_values.chrome_browser_session_service_sources,
- ".", "//chrome")
+ ".",
+ "//chrome")
}
if (!is_android && !is_ios && !is_chromeos) {
- sources += rebase_path(gypi_values.chrome_browser_desktop_sources,
- ".", "//chrome")
+ sources +=
+ rebase_path(gypi_values.chrome_browser_desktop_sources, ".", "//chrome")
}
if (is_android || is_ios) {
# Mobile.
- sources += rebase_path(gypi_values.chrome_browser_mobile_sources,
- ".", "//chrome")
+ sources +=
+ rebase_path(gypi_values.chrome_browser_mobile_sources, ".", "//chrome")
} else {
# Non-mobile.
sources += rebase_path(gypi_values.chrome_browser_non_mobile_sources,
- ".", "//chrome")
+ ".",
+ "//chrome")
deps += [
"//device/core",
"//device/usb",
@@ -530,8 +556,8 @@
}
if (is_android) {
- sources += rebase_path(gypi_values.chrome_browser_android_sources,
- ".", "//chrome")
+ sources +=
+ rebase_path(gypi_values.chrome_browser_android_sources, ".", "//chrome")
deps += [
":jni_headers",
"//components/cdm/browser",
@@ -549,7 +575,8 @@
]
} else {
sources += rebase_path(gypi_values.chrome_browser_non_android_sources,
- ".", "//chrome")
+ ".",
+ "//chrome")
}
if (is_mac) {
@@ -571,8 +598,8 @@
}
if (enable_rlz) {
- sources += rebase_path(gypi_values.chrome_browser_rlz_sources,
- ".", "//chrome")
+ sources +=
+ rebase_path(gypi_values.chrome_browser_rlz_sources, ".", "//chrome")
deps += [ "//rlz:rlz_lib" ]
}
@@ -584,8 +611,8 @@
#}],
if (is_win) {
- sources += rebase_path(gypi_values.chrome_browser_win_sources,
- ".", "//chrome")
+ sources +=
+ rebase_path(gypi_values.chrome_browser_win_sources, ".", "//chrome")
if (!is_chrome_branded) {
sources -= [
"google/did_run_updater_win.cc",
@@ -602,6 +629,7 @@
"//third_party/iaccessible2",
"//third_party/isimpledom",
"//third_party/wtl",
+
#"chrome_process_finder", TODO(GYP)
#"../chrome_elf/chrome_elf.gyp:chrome_elf", TODO(GYP)
#"../chrome_elf/chrome_elf.gyp:chrome_elf_constants", TODO(GYP)
@@ -612,12 +640,12 @@
]
} else {
# Non-Windows.
- sources += rebase_path(gypi_values.chrome_browser_non_win_sources,
- ".", "//chrome")
+ sources +=
+ rebase_path(gypi_values.chrome_browser_non_win_sources, ".", "//chrome")
if (toolkit_views) {
deps += [
- "//ui/views",
- "//ui/views/controls/webview",
+ "//ui/views",
+ "//ui/views/controls/webview",
]
# TODO(GYP) why is this needed? Very susicious.
# "include_dirs": [
@@ -627,16 +655,14 @@
}
if (is_linux) {
- sources += rebase_path(gypi_values.chrome_browser_linux_sources,
- ".", "//chrome")
+ sources +=
+ rebase_path(gypi_values.chrome_browser_linux_sources, ".", "//chrome")
if (use_aura) {
configs += [
"//build/config/linux:dbus",
"//build/config/linux:fontconfig",
]
- deps += [
- "//dbus",
- ]
+ deps += [ "//dbus" ]
}
if (use_x11) {
configs += [ "//build/config/linux:x11" ]
@@ -646,42 +672,41 @@
if (is_desktop_linux) {
sources += rebase_path(gypi_values.chrome_browser_desktop_linux_sources,
- ".", "//chrome")
+ ".",
+ "//chrome")
}
if (enable_plugin_installation) {
- sources += rebase_path(
- gypi_values.chrome_browser_plugin_installation_sources,
- ".", "//chrome")
+ sources +=
+ rebase_path(gypi_values.chrome_browser_plugin_installation_sources,
+ ".",
+ "//chrome")
}
if (enable_app_list) {
- deps += [
- "//ui/app_list",
- ]
+ deps += [ "//ui/app_list" ]
}
if (enable_supervised_users) {
- sources += rebase_path(
- gypi_values.chrome_browser_supervised_user_sources,
- ".", "//chrome")
+ sources += rebase_path(gypi_values.chrome_browser_supervised_user_sources,
+ ".",
+ "//chrome")
}
if (enable_supervised_users && enable_themes) {
sources += rebase_path(
- gypi_values.chrome_browser_supervised_user_and_themes_sources,
- ".", "//chrome")
+ gypi_values.chrome_browser_supervised_user_and_themes_sources,
+ ".",
+ "//chrome")
}
if (enable_webrtc) {
- sources += rebase_path(
- gypi_values.chrome_browser_webrtc_sources,
- ".", "//chrome")
+ sources +=
+ rebase_path(gypi_values.chrome_browser_webrtc_sources, ".", "//chrome")
}
if (enable_service_discovery) {
- sources += rebase_path(
- gypi_values.chrome_browser_service_discovery_sources,
- ".", "//chrome")
+ sources += rebase_path(gypi_values.chrome_browser_service_discovery_sources,
+ ".",
+ "//chrome")
}
if (enable_mdns) {
- sources += rebase_path(
- gypi_values.chrome_browser_mdns_sources,
- ".", "//chrome")
+ sources +=
+ rebase_path(gypi_values.chrome_browser_mdns_sources, ".", "//chrome")
}
if (!enable_autofill_dialog || is_android || is_ios) {
sources -= [
@@ -690,15 +715,17 @@
]
}
if (enable_wifi_bootstrapping) {
- sources += rebase_path(
- gypi_values.chrome_browser_wifi_bootstrapping_sources,
- ".", "//chrome")
+ sources +=
+ rebase_path(gypi_values.chrome_browser_wifi_bootstrapping_sources,
+ ".",
+ "//chrome")
if (is_win || is_mac) {
# TODO(brettw) as of this writing wifi bootstrapping is set on Windows
# and Mac, so this test is meaningless. Can we merge these lists?
sources += rebase_path(
- gypi_values.chrome_browser_win_mac_wifi_bootstrapping_sources,
- ".", "//chrome")
+ gypi_values.chrome_browser_win_mac_wifi_bootstrapping_sources,
+ ".",
+ "//chrome")
}
}
}
@@ -706,8 +733,8 @@
if (is_android) {
# GYP version: chrome/chrome_browser.gypi:chrome_browser_jni_headers
generate_jni("jni_headers") {
- sources = rebase_path(
- gypi_values.chrome_browser_jni_sources, ".", "//chrome")
+ sources =
+ rebase_path(gypi_values.chrome_browser_jni_sources, ".", "//chrome")
jni_package = "chrome"
}
}
@@ -722,15 +749,17 @@
"browser_resources.pak",
]
- omnibox_mojom_file = "$root_gen_dir/chrome/browser/ui/webui/omnibox/omnibox.mojom.js"
+ omnibox_mojom_file =
+ "$root_gen_dir/chrome/browser/ui/webui/omnibox/omnibox.mojom.js"
grit_flags = [
- "-E", "about_credits_file=" +
- rebase_path(about_credits_file, root_build_dir),
- "-E", "additional_modules_list_file=" +
- rebase_path(additional_modules_list_file, root_build_dir),
- "-E", "omnibox_mojom_file=" +
- rebase_path(omnibox_mojom_file, root_build_dir),
+ "-E",
+ "about_credits_file=" + rebase_path(about_credits_file, root_build_dir),
+ "-E",
+ "additional_modules_list_file=" +
+ rebase_path(additional_modules_list_file, root_build_dir),
+ "-E",
+ "omnibox_mojom_file=" + rebase_path(omnibox_mojom_file, root_build_dir),
]
deps = [
@@ -749,7 +778,9 @@
# automatically when one of the credits changes. The way this should work is
# that licenses.py should write a .d file listing the input dependencies (see
# "depfile" in GN).
- outputs = [ about_credits_file ]
+ outputs = [
+ about_credits_file,
+ ]
args = [
"credits",
@@ -761,8 +792,12 @@
if (is_chrome_branded) {
action("chrome_internal_resources_gen") {
script = "internal/transform_additional_modules_list.py"
- sources = [ "internal/resources/additional_modules_list.input" ]
- outputs = [ additional_modules_list_file ]
+ sources = [
+ "internal/resources/additional_modules_list.input",
+ ]
+ outputs = [
+ additional_modules_list_file,
+ ]
args = rebase_path(sources, root_build_dir) +
rebase_path(outputs, root_build_dir)
}
@@ -884,9 +919,7 @@
"extensions/extension_action_test_util.cc",
"extensions/extension_action_test_util.h",
]
- deps += [
- "//extensions:test_support",
- ]
+ deps += [ "//extensions:test_support" ]
}
if (is_chromeos) {
@@ -987,9 +1020,7 @@
"media_galleries/media_galleries_test_util.cc",
"media_galleries/media_galleries_test_util.h",
]
- deps += [
- "//components/storage_monitor:test_support",
- ]
+ deps += [ "//components/storage_monitor:test_support" ]
}
if (enable_mdns) {
