Commit c3cdada0 authored by Natalie Chouinard's avatar Natalie Chouinard Committed by Commit Bot

Format remaining gn files in //chrome

Apply gn format to all *.gn and *.gni files in //chrome.

This version of gn now automatically sorts all lists with variable
names ending in the suffix "sources" or "deps".

Bug: 1033668
Change-Id: I01dd27153eddaa4e88257f4c4d0225a3c2a7f56f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1970281Reviewed-by: default avatarDavid Trainor <dtrainor@chromium.org>
Commit-Queue: Natalie Chouinard <chouinard@chromium.org>
Cr-Commit-Position: refs/heads/master@{#726086}
parent 42d682b8
...@@ -448,8 +448,8 @@ if (is_win) { ...@@ -448,8 +448,8 @@ if (is_win) {
deps += [ "//content/public/app:browser" ] deps += [ "//content/public/app:browser" ]
assert_no_deps = [ assert_no_deps = [
# The browser DLL may not depend on blink or v8. # The browser DLL may not depend on blink or v8.
"//third_party/blink/public:blink",
"//gin", "//gin",
"//third_party/blink/public:blink",
"//v8", "//v8",
# Ditto for PDFium. # Ditto for PDFium.
...@@ -1291,12 +1291,12 @@ if (is_win) { ...@@ -1291,12 +1291,12 @@ if (is_win) {
# This list must be updated with the two targets' deps list below, and # This list must be updated with the two targets' deps list below, and
# the list of _dsyms in :chrome_dsym_archive. # the list of _dsyms in :chrome_dsym_archive.
_chrome_symbols_sources = [ _chrome_symbols_sources = [
_framework_binary_path,
"$root_out_dir/AlertNotificationService.xpc/Contents/MacOS/AlertNotificationService",
"$root_out_dir/$chrome_product_full_name.app/Contents/MacOS/$chrome_product_full_name", "$root_out_dir/$chrome_product_full_name.app/Contents/MacOS/$chrome_product_full_name",
"$root_out_dir/AlertNotificationService.xpc/Contents/MacOS/AlertNotificationService",
"$root_out_dir/chrome_crashpad_handler", "$root_out_dir/chrome_crashpad_handler",
"$root_out_dir/libswiftshader_libEGL.dylib", "$root_out_dir/libswiftshader_libEGL.dylib",
"$root_out_dir/libswiftshader_libGLESv2.dylib", "$root_out_dir/libswiftshader_libGLESv2.dylib",
_framework_binary_path,
] ]
foreach(helper_params, content_mac_helpers) { foreach(helper_params, content_mac_helpers) {
......
...@@ -9,12 +9,12 @@ share_java_sources = [ ...@@ -9,12 +9,12 @@ share_java_sources = [
"//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/QrCodeDialogTab.java", "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/QrCodeDialogTab.java",
"//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/QrCodePageAdapter.java", "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/QrCodePageAdapter.java",
"//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/QrCodeShareActivity.java", "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/QrCodeShareActivity.java",
"//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/share_tab/QrCodeShareView.java",
"//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/share_tab/QrCodeShareCoordinator.java",
"//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/scan_tab/QrCodeScanView.java",
"//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/scan_tab/QrCodeScanCoordinator.java",
"//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/scan_tab/CameraPreview.java", "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/scan_tab/CameraPreview.java",
"//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/scan_tab/QrCodeScanCoordinator.java",
"//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/scan_tab/QrCodeScanMediator.java", "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/scan_tab/QrCodeScanMediator.java",
"//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/scan_tab/QrCodeScanViewProperties.java", "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/scan_tab/QrCodeScanView.java",
"//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/scan_tab/QrCodeScanViewBinder.java", "//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/scan_tab/QrCodeScanViewBinder.java",
"//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/scan_tab/QrCodeScanViewProperties.java",
"//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/share_tab/QrCodeShareCoordinator.java",
"//chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/qrcode/share_tab/QrCodeShareView.java",
] ]
...@@ -776,8 +776,8 @@ mojom("mojo_bindings") { ...@@ -776,8 +776,8 @@ mojom("mojo_bindings") {
} }
overridden_deps = [ overridden_deps = [
"//third_party/blink/public/mojom:mojom_platform",
"//content/public/common:interfaces", "//content/public/common:interfaces",
"//third_party/blink/public/mojom:mojom_platform",
] ]
component_deps = [ "//content/public/common" ] component_deps = [ "//content/public/common" ]
......
...@@ -7,9 +7,8 @@ import("//build/config/sanitizers/sanitizers.gni") ...@@ -7,9 +7,8 @@ import("//build/config/sanitizers/sanitizers.gni")
import("//build/config/sysroot.gni") import("//build/config/sysroot.gni")
declare_args() { declare_args() {
enable_linux_installer = enable_linux_installer = is_linux && !is_chromeos && !is_component_build &&
is_linux && !is_chromeos && !is_component_build && use_sysroot && use_sysroot && !using_sanitizer
!using_sanitizer
} }
# Meta-target that forwards to the installer of the correct type (if any). # Meta-target that forwards to the installer of the correct type (if any).
......
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
mac_signing_sources = [ mac_signing_sources = [
"signing/__init__.py", "signing/__init__.py",
"signing/commands.py",
"signing/chromium_config.py", "signing/chromium_config.py",
"signing/commands.py",
"signing/config.py", "signing/config.py",
"signing/model.py", "signing/model.py",
"signing/modification.py", "signing/modification.py",
......
...@@ -42,9 +42,9 @@ template("process_version_rc_template") { ...@@ -42,9 +42,9 @@ template("process_version_rc_template") {
_template_file = "//chrome/app/chrome_version.rc.version" _template_file = "//chrome/app/chrome_version.rc.version"
} }
_sources = [ _sources = [
lastchange_file,
"//chrome/VERSION", "//chrome/VERSION",
branding_file_path, branding_file_path,
lastchange_file,
] ]
if (defined(invoker.sources)) { if (defined(invoker.sources)) {
_sources += invoker.sources _sources += invoker.sources
......
...@@ -14,6 +14,6 @@ android_library("test_trusted_web_activity_java") { ...@@ -14,6 +14,6 @@ android_library("test_trusted_web_activity_java") {
"src/org/chromium/chrome/browser/browserservices/TestTrustedWebActivityService.java", "src/org/chromium/chrome/browser/browserservices/TestTrustedWebActivityService.java",
] ]
deps = [ deps = [
"//third_party/android_sdk/androidx_browser:androidx_browser_java" "//third_party/android_sdk/androidx_browser:androidx_browser_java",
] ]
} }
...@@ -5,7 +5,5 @@ ...@@ -5,7 +5,5 @@
import("//ui/webui/resources/tools/js_modulizer.gni") import("//ui/webui/resources/tools/js_modulizer.gni")
js_modulizer("modulize") { js_modulizer("modulize") {
input_files = [ input_files = [ "list_property_update_behavior_tests.js" ]
"list_property_update_behavior_tests.js",
]
} }
...@@ -60,9 +60,9 @@ if (is_win) { ...@@ -60,9 +60,9 @@ if (is_win) {
testonly = true testonly = true
data_deps = [ data_deps = [
"//chrome/test/chromedriver:chromedriver",
"//chrome/installer/mini_installer:mini_installer", "//chrome/installer/mini_installer:mini_installer",
"//chrome/installer/mini_installer:previous_version_mini_installer", "//chrome/installer/mini_installer:previous_version_mini_installer",
"//chrome/test/chromedriver:chromedriver",
] ]
data = [ data = [
"//third_party/webdriver/pylib/", "//third_party/webdriver/pylib/",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment