summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortfarina <tfarina@chromium.org>2015-11-02 16:49:39 -0800
committerCommit bot <commit-bot@chromium.org>2015-11-03 00:50:34 +0000
commitf7698e039267b2d07401506006c0f68bfbfe2453 (patch)
tree08afedf2bf08aad7f998fae777d3bc7c7616ccbf
parent744612a3c9be57a263f1ed287af027b774dd1947 (diff)
downloadchromium_src-f7698e039267b2d07401506006c0f68bfbfe2453.zip
chromium_src-f7698e039267b2d07401506006c0f68bfbfe2453.tar.gz
chromium_src-f7698e039267b2d07401506006c0f68bfbfe2453.tar.bz2
gn format everything.
This patch was generated using the following command line: $ git ls-files "*.gn" | grep -v format_test_data | sed -e "s/^/gn format --in-place /" >x.sh $ chmod +x x.sh $ ./x.sh BUG=None R=dpranke@chromium.org,scottmg@chromium.org TBR=brettw@chromium.org Review URL: https://codereview.chromium.org/1415753003 Cr-Commit-Position: refs/heads/master@{#357493}
-rw-r--r--build/android/pylib/device/commands/BUILD.gn4
-rw-r--r--build/secondary/third_party/nss/BUILD.gn2
-rw-r--r--components/policy/android/BUILD.gn11
-rw-r--r--components/resource_provider/BUILD.gn4
-rw-r--r--device/devices_app/BUILD.gn4
-rw-r--r--third_party/WebKit/Source/bindings/BUILD.gn1
-rw-r--r--third_party/WebKit/Source/bindings/core/BUILD.gn9
-rw-r--r--third_party/WebKit/Source/bindings/modules/BUILD.gn44
-rw-r--r--third_party/WebKit/Source/bindings/modules/v8/BUILD.gn19
-rw-r--r--third_party/WebKit/Source/bindings/scripts/BUILD.gn7
-rw-r--r--third_party/WebKit/Source/core/inspector/BUILD.gn17
-rw-r--r--third_party/WebKit/Source/devtools/BUILD.gn222
-rw-r--r--third_party/WebKit/Source/modules/BUILD.gn20
-rw-r--r--third_party/WebKit/Source/platform/heap/BUILD.gn4
-rw-r--r--third_party/WebKit/Source/platform/heap/asm/BUILD.gn75
-rw-r--r--third_party/WebKit/Source/wtf/BUILD.gn24
-rw-r--r--third_party/WebKit/public/BUILD.gn13
-rw-r--r--third_party/cld_2/BUILD.gn1
-rw-r--r--third_party/freetype-android/BUILD.gn1
-rw-r--r--third_party/harfbuzz-ng/BUILD.gn7
-rw-r--r--third_party/mojo/src/mojo/public/cpp/utility/BUILD.gn12
-rw-r--r--third_party/zlib/BUILD.gn3
-rw-r--r--ui/resources/BUILD.gn4
-rw-r--r--ui/touch_selection/BUILD.gn4
-rw-r--r--ui/wm/BUILD.gn4
25 files changed, 286 insertions, 230 deletions
diff --git a/build/android/pylib/device/commands/BUILD.gn b/build/android/pylib/device/commands/BUILD.gn
index 363c2f4..c6d4b42 100644
--- a/build/android/pylib/device/commands/BUILD.gn
+++ b/build/android/pylib/device/commands/BUILD.gn
@@ -5,7 +5,9 @@
import("//build/config/android/rules.gni")
group("commands") {
- data_deps = [ ":chromium_commands" ]
+ data_deps = [
+ ":chromium_commands",
+ ]
}
# GYP: //build/android/pylib/device/commands/commands.gyp:chromium_commands
diff --git a/build/secondary/third_party/nss/BUILD.gn b/build/secondary/third_party/nss/BUILD.gn
index 30e5c39..8d152e9 100644
--- a/build/secondary/third_party/nss/BUILD.gn
+++ b/build/secondary/third_party/nss/BUILD.gn
@@ -1175,8 +1175,8 @@ if (is_linux) {
# Not Windows.
sources -= [
# mpi_x86_asm.c contains MSVC inline assembly code.
- "nss/lib/freebl/mpi/mpi_x86_asm.c",
"nss/lib/freebl/intel-aes-x86-masm.asm",
+ "nss/lib/freebl/mpi/mpi_x86_asm.c",
]
}
diff --git a/components/policy/android/BUILD.gn b/components/policy/android/BUILD.gn
index 4d84602..a3ef6ba 100644
--- a/components/policy/android/BUILD.gn
+++ b/components/policy/android/BUILD.gn
@@ -14,11 +14,12 @@ android_library("policy_java") {
deps = [
"//base:base_java",
]
- java_files = _jni_sources + [
- "java/src/org/chromium/policy/AbstractAppRestrictionsProvider.java",
- "java/src/org/chromium/policy/AppRestrictionsProvider.java",
- "java/src/org/chromium/policy/PolicyProvider.java",
- ]
+ java_files =
+ _jni_sources + [
+ "java/src/org/chromium/policy/AbstractAppRestrictionsProvider.java",
+ "java/src/org/chromium/policy/AppRestrictionsProvider.java",
+ "java/src/org/chromium/policy/PolicyProvider.java",
+ ]
}
# GYP: //components/components.gyp:policy_jni_headers
diff --git a/components/resource_provider/BUILD.gn b/components/resource_provider/BUILD.gn
index aae1a75..9985579 100644
--- a/components/resource_provider/BUILD.gn
+++ b/components/resource_provider/BUILD.gn
@@ -141,5 +141,7 @@ mojo_native_application("apptests") {
"//mojo/platform_handle",
]
- data_deps = [ ":resource_provider" ]
+ data_deps = [
+ ":resource_provider",
+ ]
}
diff --git a/device/devices_app/BUILD.gn b/device/devices_app/BUILD.gn
index 2450b63..cccad12 100644
--- a/device/devices_app/BUILD.gn
+++ b/device/devices_app/BUILD.gn
@@ -69,6 +69,8 @@ if (!is_component_build) {
"//device/devices_app/usb/public/interfaces",
]
- data_deps = [ ":devices" ]
+ data_deps = [
+ ":devices",
+ ]
}
}
diff --git a/third_party/WebKit/Source/bindings/BUILD.gn b/third_party/WebKit/Source/bindings/BUILD.gn
index a803815..2624c2e 100644
--- a/third_party/WebKit/Source/bindings/BUILD.gn
+++ b/third_party/WebKit/Source/bindings/BUILD.gn
@@ -6,4 +6,3 @@ import("//third_party/WebKit/Source/bindings/bindings.gni")
import("//third_party/WebKit/Source/build/scripts/scripts.gni")
import("//third_party/WebKit/Source/core/core.gni")
import("//third_party/WebKit/Source/modules/modules.gni")
-
diff --git a/third_party/WebKit/Source/bindings/core/BUILD.gn b/third_party/WebKit/Source/bindings/core/BUILD.gn
index 8112cb5..2b0dd10 100644
--- a/third_party/WebKit/Source/bindings/core/BUILD.gn
+++ b/third_party/WebKit/Source/bindings/core/BUILD.gn
@@ -13,9 +13,8 @@ compute_interfaces_info_individual("interfaces_info_individual_core") {
sources_static = core_static_idl_files
sources_generated = core_generated_idl_files
interfaces_info_file =
- "$bindings_core_output_dir/InterfacesInfoCoreIndividual.pickle"
- component_info_file =
- "$bindings_core_output_dir/ComponentInfoCore.pickle"
+ "$bindings_core_output_dir/InterfacesInfoCoreIndividual.pickle"
+ component_info_file = "$bindings_core_output_dir/ComponentInfoCore.pickle"
deps = [
"//third_party/WebKit/Source/bindings/core:core_global_constructors_idls",
"//third_party/WebKit/Source/core:generated_testing_idls_settings",
@@ -38,5 +37,7 @@ generate_global_constructors("core_global_constructors_idls") {
interfaces = core_global_constructors_original_interfaces
component = "Core"
output_dir = blink_core_output_dir
- deps = [ ":core_global_objects" ]
+ deps = [
+ ":core_global_objects",
+ ]
}
diff --git a/third_party/WebKit/Source/bindings/modules/BUILD.gn b/third_party/WebKit/Source/bindings/modules/BUILD.gn
index 98f3589..5ecac1c 100644
--- a/third_party/WebKit/Source/bindings/modules/BUILD.gn
+++ b/third_party/WebKit/Source/bindings/modules/BUILD.gn
@@ -29,9 +29,7 @@ generate_event_interfaces("modules_bindings_generated_event_interfaces") {
# GYP version: EventModulesFactory action in bindings_modules_generated
make_event_factory("bindings_modules_generated_event_modules_factory") {
- in_files = [
- "$root_gen_dir/blink/EventModulesInterfaces.in",
- ]
+ in_files = [ "$root_gen_dir/blink/EventModulesInterfaces.in" ]
outputs = [
"$blink_modules_output_dir/EventModules.cpp",
"$blink_modules_output_dir/EventModulesHeaders.h",
@@ -43,9 +41,7 @@ make_event_factory("bindings_modules_generated_event_modules_factory") {
# GYP version: EventModulesNames action in bindings_modules_generated
make_names("bindings_modules_generated_event_modules_names") {
- in_files = [
- "$root_gen_dir/blink/EventModulesInterfaces.in",
- ]
+ in_files = [ "$root_gen_dir/blink/EventModulesInterfaces.in" ]
outputs = [
"$blink_modules_output_dir/EventModulesNames.cpp",
"$blink_modules_output_dir/EventModulesNames.h",
@@ -57,9 +53,7 @@ make_names("bindings_modules_generated_event_modules_names") {
# GYP version: EventTargetModulesNames action in bindings_modules_generated
make_names("bindings_modules_generated_event_target_modules_names") {
- in_files = [
- "../../modules/EventTargetModulesFactory.in",
- ]
+ in_files = [ "../../modules/EventTargetModulesFactory.in" ]
outputs = [
"$blink_modules_output_dir/EventTargetModulesNames.cpp",
"$blink_modules_output_dir/EventTargetModulesNames.h",
@@ -73,9 +67,9 @@ compute_interfaces_info_individual("interfaces_info_individual_modules") {
sources_static = modules_static_idl_files
sources_generated = modules_generated_dependency_idl_files
interfaces_info_file =
- "$bindings_modules_output_dir/InterfacesInfoOverallIndividual.pickle"
+ "$bindings_modules_output_dir/InterfacesInfoOverallIndividual.pickle"
component_info_file =
- "$bindings_modules_output_dir/ComponentInfoModules.pickle"
+ "$bindings_modules_output_dir/ComponentInfoModules.pickle"
deps = [
":modules_core_global_constructors_idls",
":modules_global_constructors_idls",
@@ -97,15 +91,13 @@ action("interfaces_info") {
args = [
"--write-file-only-if-changed=1",
"--",
- rebase_path(
- "$bindings_core_output_dir/InterfacesInfoCoreIndividual.pickle",
- root_build_dir),
+ rebase_path("$bindings_core_output_dir/InterfacesInfoCoreIndividual.pickle",
+ root_build_dir),
rebase_path(
"$bindings_modules_output_dir/InterfacesInfoOverallIndividual.pickle",
root_build_dir),
- rebase_path(
- "$bindings_modules_output_dir/InterfacesInfoOverall.pickle",
- root_build_dir),
+ rebase_path("$bindings_modules_output_dir/InterfacesInfoOverall.pickle",
+ root_build_dir),
]
public_deps = [
@@ -119,25 +111,33 @@ compute_global_objects("modules_global_objects") {
sources = modules_idl_files
sources_generated = [ "$bindings_core_output_dir/GlobalObjectsCore.pickle" ]
output_file = "$bindings_modules_output_dir/GlobalObjectsModules.pickle"
- deps = [ "//third_party/WebKit/Source/bindings/core:core_global_objects" ]
+ deps = [
+ "//third_party/WebKit/Source/bindings/core:core_global_objects",
+ ]
}
# GYP version: Source/bindings/modules/generated.gyp:modules_core_global_constructors_idls
generate_global_constructors("modules_core_global_constructors_idls") {
sources = core_idl_files + core_idl_with_modules_dependency_files
- global_objects_file = "$bindings_modules_output_dir/GlobalObjectsModules.pickle"
+ global_objects_file =
+ "$bindings_modules_output_dir/GlobalObjectsModules.pickle"
interfaces = modules_core_global_constructors_original_interfaces
component = "Core"
output_dir = blink_modules_output_dir
- deps = [ ":modules_global_objects" ]
+ deps = [
+ ":modules_global_objects",
+ ]
}
# GYP version: Source/bindings/modules/generated.gyp:modules_global_constructors_idls
generate_global_constructors("modules_global_constructors_idls") {
sources = modules_idl_files
- global_objects_file = "$bindings_modules_output_dir/GlobalObjectsModules.pickle"
+ global_objects_file =
+ "$bindings_modules_output_dir/GlobalObjectsModules.pickle"
interfaces = modules_global_constructors_original_interfaces
component = "Modules"
output_dir = blink_modules_output_dir
- deps = [ ":modules_global_objects" ]
+ deps = [
+ ":modules_global_objects",
+ ]
}
diff --git a/third_party/WebKit/Source/bindings/modules/v8/BUILD.gn b/third_party/WebKit/Source/bindings/modules/v8/BUILD.gn
index 2cc5722..b98ab98 100644
--- a/third_party/WebKit/Source/bindings/modules/v8/BUILD.gn
+++ b/third_party/WebKit/Source/bindings/modules/v8/BUILD.gn
@@ -8,7 +8,8 @@ import("//third_party/WebKit/Source/modules/modules.gni")
visibility = [ "//third_party/WebKit/*" ]
-core_idl_with_modules_dependency_files_list = "$target_gen_dir/core_idl_with_modules_dependency_files.tmp"
+core_idl_with_modules_dependency_files_list =
+ "$target_gen_dir/core_idl_with_modules_dependency_files.tmp"
write_file(core_idl_with_modules_dependency_files_list,
rebase_path(core_idl_with_modules_dependency_files, root_build_dir))
@@ -45,7 +46,7 @@ idl_compiler("bindings_modules_v8_generated_individual") {
idl_impl("bindings_modules_impl_generated") {
sources = modules_dictionary_idl_files
outputs = bindings_modules_generated_union_type_files +
- generated_modules_dictionary_files
+ generated_modules_dictionary_files
output_dir = bindings_modules_v8_output_dir
target_component = "modules"
}
@@ -54,14 +55,16 @@ idl_impl("bindings_modules_impl_generated") {
idl_compiler("bindings_modules_v8_generated_partial_individual") {
# Note in GYP this is modules_interface_idl_files but this variable is just
# defined to modules_definition_idl_files.
- sources = core_idl_with_modules_dependency_files + webcore_testing_idl_with_modules_dependency_files
+ sources = core_idl_with_modules_dependency_files +
+ webcore_testing_idl_with_modules_dependency_files
output_dir = bindings_modules_v8_output_dir
output_name_suffix = "Partial"
target_component = "modules"
}
# bindings_modules_generated_aggregate in modules/v8/generated.gyp
-aggregate_generated_bindings("bindings_modules_v8_generated_partial_aggregate") {
+aggregate_generated_bindings(
+ "bindings_modules_v8_generated_partial_aggregate") {
sources = core_idl_with_modules_dependency_files
component_dir = "modules"
outputs = bindings_modules_generated_partial_aggregate_files
@@ -75,13 +78,16 @@ action("bindings_modules_v8_generated_init_partial") {
core_idl_with_modules_dependency_files_list,
"$bindings_modules_output_dir/InterfacesInfoOverall.pickle",
]
- outputs = [ bindings_modules_generated_init_partial_interfaces_file ]
+ outputs = [
+ bindings_modules_generated_init_partial_interfaces_file,
+ ]
args = [
"--idl-files-list",
rebase_path(core_idl_with_modules_dependency_files_list, root_build_dir),
"--output",
- rebase_path(bindings_modules_generated_init_partial_interfaces_file, root_build_dir),
+ rebase_path(bindings_modules_generated_init_partial_interfaces_file,
+ root_build_dir),
"--write-file-only-if-changed=1",
]
@@ -89,4 +95,3 @@ action("bindings_modules_v8_generated_init_partial") {
"//third_party/WebKit/Source/bindings/modules:interfaces_info",
]
}
-
diff --git a/third_party/WebKit/Source/bindings/scripts/BUILD.gn b/third_party/WebKit/Source/bindings/scripts/BUILD.gn
index cc01730..3d09601 100644
--- a/third_party/WebKit/Source/bindings/scripts/BUILD.gn
+++ b/third_party/WebKit/Source/bindings/scripts/BUILD.gn
@@ -37,10 +37,13 @@ action("cached_jinja_templates") {
script = "code_generator_v8.py"
inputs = jinja_module_files + [ "code_generator_v8.py" ] +
- code_generator_template_files
+ code_generator_template_files
+
# Dummy file to track dependency.
stamp_file = "$bindings_scripts_output_dir/cached_jinja_templates.stamp"
- outputs = [ stamp_file ]
+ outputs = [
+ stamp_file,
+ ]
args = [
rebase_path(bindings_scripts_output_dir, root_build_dir),
diff --git a/third_party/WebKit/Source/core/inspector/BUILD.gn b/third_party/WebKit/Source/core/inspector/BUILD.gn
index 83e1f47..916f47d 100644
--- a/third_party/WebKit/Source/core/inspector/BUILD.gn
+++ b/third_party/WebKit/Source/core/inspector/BUILD.gn
@@ -28,7 +28,8 @@ action("protocol_sources") {
args = [
rebase_path(protocol_file, root_build_dir),
- "--output_dir", rebase_path(blink_core_output_dir, root_build_dir),
+ "--output_dir",
+ rebase_path(blink_core_output_dir, root_build_dir),
]
deps = [
@@ -54,19 +55,25 @@ action("instrumentation_sources") {
args = [
rebase_path("InspectorInstrumentation.idl", root_build_dir),
- "--output_dir", rebase_path(blink_core_output_dir, root_build_dir),
+ "--output_dir",
+ rebase_path(blink_core_output_dir, root_build_dir),
]
}
action("protocol_version") {
script = "generate-inspector-protocol-version"
- inputs = [ protocol_file ]
+ inputs = [
+ protocol_file,
+ ]
output_file = "$blink_core_output_dir/InspectorProtocolVersion.h"
- outputs = [ output_file ]
+ outputs = [
+ output_file,
+ ]
args = [
- "-o", rebase_path(output_file, root_build_dir),
+ "-o",
+ rebase_path(output_file, root_build_dir),
rebase_path(protocol_file, root_build_dir),
]
}
diff --git a/third_party/WebKit/Source/devtools/BUILD.gn b/third_party/WebKit/Source/devtools/BUILD.gn
index 6722ea8..542f0843 100644
--- a/third_party/WebKit/Source/devtools/BUILD.gn
+++ b/third_party/WebKit/Source/devtools/BUILD.gn
@@ -4,69 +4,61 @@
import("//build/config/features.gni")
-gypi_values = exec_script(
- "//build/gypi_to_gn.py",
- [ rebase_path("devtools.gypi") ],
- "scope",
- [ "devtools.gypi" ])
+gypi_values = exec_script("//build/gypi_to_gn.py",
+ [ rebase_path("devtools.gypi") ],
+ "scope",
+ [ "devtools.gypi" ])
# Some of the files in the .gypi use GYP variable expansions, go through and
# fix them.
devtools_core_files =
- gypi_values.devtools_core_base_files +
- gypi_values.devtools_bindings_js_files +
- gypi_values.devtools_common_js_files +
- gypi_values.devtools_components_js_files +
- gypi_values.devtools_emulation_js_files +
- gypi_values.devtools_host_js_files +
- gypi_values.devtools_main_js_files +
- gypi_values.devtools_platform_js_files +
- gypi_values.devtools_sdk_js_files +
- gypi_values.devtools_toolbox_bootstrap_js_files +
- gypi_values.devtools_ui_js_files +
- gypi_values.devtools_workspace_js_files +
- gypi_values.devtools_core_css_files
+ gypi_values.devtools_core_base_files +
+ gypi_values.devtools_bindings_js_files +
+ gypi_values.devtools_common_js_files +
+ gypi_values.devtools_components_js_files +
+ gypi_values.devtools_emulation_js_files +
+ gypi_values.devtools_host_js_files + gypi_values.devtools_main_js_files +
+ gypi_values.devtools_platform_js_files + gypi_values.devtools_sdk_js_files +
+ gypi_values.devtools_toolbox_bootstrap_js_files +
+ gypi_values.devtools_ui_js_files + gypi_values.devtools_workspace_js_files +
+ gypi_values.devtools_core_css_files
devtools_extensions_js_files = gypi_values.devtools_extensions_js_files -
- [ "<@(devtools_extension_api_files)" ] +
- gypi_values.devtools_extension_api_files
+ [ "<@(devtools_extension_api_files)" ] +
+ gypi_values.devtools_extension_api_files
devtools_modules_js_files =
- gypi_values.devtools_accessibility_js_files +
- gypi_values.devtools_audits_js_files +
- gypi_values.devtools_animation_js_files +
- gypi_values.devtools_cm_modes_js_files +
- gypi_values.devtools_components_lazy_js_files +
- gypi_values.devtools_console_js_files +
- gypi_values.devtools_devices_js_files +
- gypi_values.devtools_diff_js_files +
- gypi_values.devtools_elements_js_files +
- gypi_values.devtools_emulated_devices_js_files +
- devtools_extensions_js_files +
- gypi_values.devtools_heap_snapshot_worker_js_files +
- gypi_values.devtools_layers_js_files +
- gypi_values.devtools_network_js_files +
- gypi_values.devtools_profiler_js_files +
- gypi_values.devtools_promises_js_files +
- gypi_values.devtools_resources_js_files +
- gypi_values.devtools_security_js_files +
- gypi_values.devtools_screencast_js_files +
- gypi_values.devtools_script_formatter_worker_js_files +
- gypi_values.devtools_settings_js_files +
- gypi_values.devtools_snippets_js_files +
- gypi_values.devtools_source_frame_js_files +
- gypi_values.devtools_sources_js_files +
- gypi_values.devtools_temp_storage_shared_worker_js_files +
- gypi_values.devtools_timeline_js_files +
- gypi_values.devtools_ui_lazy_js_files
+ gypi_values.devtools_accessibility_js_files +
+ gypi_values.devtools_audits_js_files +
+ gypi_values.devtools_animation_js_files +
+ gypi_values.devtools_cm_modes_js_files +
+ gypi_values.devtools_components_lazy_js_files +
+ gypi_values.devtools_console_js_files +
+ gypi_values.devtools_devices_js_files + gypi_values.devtools_diff_js_files +
+ gypi_values.devtools_elements_js_files +
+ gypi_values.devtools_emulated_devices_js_files +
+ devtools_extensions_js_files +
+ gypi_values.devtools_heap_snapshot_worker_js_files +
+ gypi_values.devtools_layers_js_files +
+ gypi_values.devtools_network_js_files +
+ gypi_values.devtools_profiler_js_files +
+ gypi_values.devtools_promises_js_files +
+ gypi_values.devtools_resources_js_files +
+ gypi_values.devtools_security_js_files +
+ gypi_values.devtools_screencast_js_files +
+ gypi_values.devtools_script_formatter_worker_js_files +
+ gypi_values.devtools_settings_js_files +
+ gypi_values.devtools_snippets_js_files +
+ gypi_values.devtools_source_frame_js_files +
+ gypi_values.devtools_sources_js_files +
+ gypi_values.devtools_temp_storage_shared_worker_js_files +
+ gypi_values.devtools_timeline_js_files +
+ gypi_values.devtools_ui_lazy_js_files
all_devtools_files =
- gypi_values.devtools_cm_css_files +
- gypi_values.devtools_cm_js_files +
- devtools_core_files +
- gypi_values.devtools_module_json_files +
- devtools_modules_js_files +
- gypi_values.devtools_acorn_files
+ gypi_values.devtools_cm_css_files + gypi_values.devtools_cm_js_files +
+ devtools_core_files + gypi_values.devtools_module_json_files +
+ devtools_modules_js_files + gypi_values.devtools_acorn_files
# FIXME: Fix the generate_devtools_grd.py script to accept trailing slashes.
resources_out_dir_no_slash = "$root_out_dir/resources/inspector"
@@ -104,23 +96,31 @@ group("devtools_frontend_resources") {
copy("copy_compatibility_scripts") {
sources = gypi_values.devtools_compatibility_scripts
- outputs = [ resources_out_dir + "{{source_file_part}}" ]
+ outputs = [
+ resources_out_dir + "{{source_file_part}}",
+ ]
}
copy("copy_inspector_images") {
sources = gypi_values.devtools_image_files
- outputs = [ resources_out_dir + "Images/{{source_file_part}}" ]
+ outputs = [
+ resources_out_dir + "Images/{{source_file_part}}",
+ ]
}
copy("copy_emulated_devices_images") {
sources = gypi_values.devtools_emulated_devices_images
- outputs = [ resources_out_dir + "emulated_devices/{{source_file_part}}" ]
+ outputs = [
+ resources_out_dir + "emulated_devices/{{source_file_part}}",
+ ]
}
action("generate_devtools_grd") {
script = "scripts/generate_devtools_grd.py"
- deps = [ ":devtools_frontend_resources" ]
+ deps = [
+ ":devtools_frontend_resources",
+ ]
static_files_list = "$target_gen_dir/devtools_static_grd_files.tmp"
inputs = gypi_values.devtools_image_files + all_devtools_files
inputs += gypi_values.devtools_compatibility_scripts
@@ -131,9 +131,9 @@ action("generate_devtools_grd") {
if (debug_devtools) {
# Debug: all files are picked as-is.
generated_files = generated_scripts + [
- resources_out_dir + "inspector.html",
- resources_out_dir + "toolbox.html",
- ]
+ resources_out_dir + "inspector.html",
+ resources_out_dir + "toolbox.html",
+ ]
static_files += all_devtools_files + [ "front_end/Runtime.js" ]
} else {
# Release: pick compiled non-remote files and lazy-loaded CSS.
@@ -177,55 +177,73 @@ action("generate_devtools_grd") {
inputs += generated_files
outfile = "$root_gen_dir/devtools/devtools_resources.grd"
- outputs = [ outfile ]
+ outputs = [
+ outfile,
+ ]
relative_path_dirs = [
resources_out_dir_no_slash,
"front_end",
]
- args = rebase_path(generated_files, root_build_dir) +
- rebase_path(generated_files, root_build_dir) +
- rebase_path(gypi_values.devtools_compatibility_scripts, root_build_dir) + [
- "--static_files_list", rebase_path(static_files_list, root_build_dir),
- "--relative_path_dirs" ] +
- rebase_path(relative_path_dirs, root_build_dir) + [
- "--images", rebase_path(images_path, root_build_dir),
- "--output", rebase_path(outfile, root_build_dir),
- ]
+ args =
+ rebase_path(generated_files, root_build_dir) +
+ rebase_path(generated_files, root_build_dir) +
+ rebase_path(gypi_values.devtools_compatibility_scripts, root_build_dir) +
+ [
+ "--static_files_list",
+ rebase_path(static_files_list, root_build_dir),
+ "--relative_path_dirs",
+ ] + rebase_path(relative_path_dirs, root_build_dir) +
+ [
+ "--images",
+ rebase_path(images_path, root_build_dir),
+ "--output",
+ rebase_path(outfile, root_build_dir),
+ ]
}
action("devtools_extension_api") {
script = "scripts/generate_devtools_extension_api.py"
inputs = gypi_values.devtools_extension_api_files
- outputs = [ resources_out_dir + "devtools_extension_api.js" ]
+ outputs = [
+ resources_out_dir + "devtools_extension_api.js",
+ ]
args = rebase_path(outputs, root_build_dir) +
- rebase_path(gypi_values.devtools_extension_api_files, root_build_dir)
+ rebase_path(gypi_values.devtools_extension_api_files, root_build_dir)
}
action("supported_css_properties") {
script = "scripts/generate_supported_css.py"
- inputs = [ "../core/css/CSSProperties.in" ]
+ inputs = [
+ "../core/css/CSSProperties.in",
+ ]
- outputs = [ resources_out_dir + "SupportedCSSProperties.js" ]
+ outputs = [
+ resources_out_dir + "SupportedCSSProperties.js",
+ ]
- args = rebase_path(inputs, root_build_dir) +
- rebase_path(outputs, root_build_dir)
+ args =
+ rebase_path(inputs, root_build_dir) + rebase_path(outputs, root_build_dir)
}
action("frontend_protocol_sources") {
script = "scripts/CodeGeneratorFrontend.py"
- inputs = [ "protocol.json" ]
- outputs = [ resources_out_dir + "InspectorBackendCommands.js" ]
+ inputs = [
+ "protocol.json",
+ ]
+ outputs = [
+ resources_out_dir + "InspectorBackendCommands.js",
+ ]
args = rebase_path(inputs, root_build_dir) + [
- "--output_js_dir",
- rebase_path(resources_out_dir, root_build_dir),
- ]
+ "--output_js_dir",
+ rebase_path(resources_out_dir, root_build_dir),
+ ]
}
action("build_applications") {
@@ -236,9 +254,9 @@ action("build_applications") {
]
inputs = helper_scripts + all_devtools_files + generated_scripts + [
- "front_end/inspector.html",
- "front_end/toolbox.html",
- ]
+ "front_end/inspector.html",
+ "front_end/toolbox.html",
+ ]
outputs = [
resources_out_dir + "inspector.html",
@@ -290,10 +308,14 @@ action("build_applications") {
}
args = [
- "inspector", "toolbox",
- "--input_path", rebase_path("front_end", root_build_dir),
- "--output_path", rebase_path(resources_out_dir, root_build_dir),
- "--debug", debug_mode
+ "inspector",
+ "toolbox",
+ "--input_path",
+ rebase_path("front_end", root_build_dir),
+ "--output_path",
+ rebase_path(resources_out_dir, root_build_dir),
+ "--debug",
+ debug_mode,
]
}
@@ -309,19 +331,25 @@ if (debug_devtools) {
copy("copy_runtime_core") {
sources = gypi_values.devtools_core_base_files +
- gypi_values.devtools_core_css_files
- outputs = [ resources_out_dir + "/{{source_file_part}}" ]
+ gypi_values.devtools_core_css_files
+ outputs = [
+ resources_out_dir + "/{{source_file_part}}",
+ ]
}
copy("copy_acorn_js_files") {
sources = gypi_values.devtools_acorn_files
- outputs = [ resources_out_dir + "acorn/{{source_file_part}}" ]
+ outputs = [
+ resources_out_dir + "acorn/{{source_file_part}}",
+ ]
}
copy("copy_codemirror_files") {
- sources = gypi_values.devtools_cm_js_files +
- gypi_values.devtools_cm_css_files
- outputs = [ resources_out_dir + "cm/{{source_file_part}}" ]
+ sources =
+ gypi_values.devtools_cm_js_files + gypi_values.devtools_cm_css_files
+ outputs = [
+ resources_out_dir + "cm/{{source_file_part}}",
+ ]
}
}
@@ -337,10 +365,12 @@ if (!debug_devtools) {
input_stylesheet = "front_end/" + app_name + ".css"
inputs = [ input_stylesheet ] + gypi_values.devtools_core_css_files
- outputs = [ resources_out_dir + app_name + ".css" ]
+ outputs = [
+ resources_out_dir + app_name + ".css",
+ ]
args = [ rebase_path(input_stylesheet, root_build_dir) ] +
- rebase_path(outputs, root_build_dir)
+ rebase_path(outputs, root_build_dir)
}
}
diff --git a/third_party/WebKit/Source/modules/BUILD.gn b/third_party/WebKit/Source/modules/BUILD.gn
index 0510abc..4a7d6fb 100644
--- a/third_party/WebKit/Source/modules/BUILD.gn
+++ b/third_party/WebKit/Source/modules/BUILD.gn
@@ -19,18 +19,18 @@ source_set("modules") {
sources += bindings_modules_v8_files
sources += rebase_path(bindings_modules_generated_aggregate_files, ".", "//")
sources += rebase_path(bindings_modules_generated_union_type_files, ".", "//")
- sources += rebase_path(bindings_modules_generated_partial_aggregate_files, ".", "//")
- sources += rebase_path([ bindings_modules_generated_init_partial_interfaces_file ], ".", "//")
+ sources +=
+ rebase_path(bindings_modules_generated_partial_aggregate_files, ".", "//")
+ sources +=
+ rebase_path([ bindings_modules_generated_init_partial_interfaces_file ],
+ ".",
+ "//")
if (!is_win) {
- sources -= [
- "webdatabase/sqlite/SQLiteFileSystemWin.cpp",
- ]
+ sources -= [ "webdatabase/sqlite/SQLiteFileSystemWin.cpp" ]
}
if (!is_posix) {
- sources -= [
- "webdatabase/sqlite/SQLiteFileSystemPosix.cpp",
- ]
+ sources -= [ "webdatabase/sqlite/SQLiteFileSystemPosix.cpp" ]
}
configs += [
@@ -49,9 +49,7 @@ source_set("modules") {
]
if (is_win) {
- cflags = [
- "/wd4334", # Result of 32-bit shift implicitly converted to 64 bits.
- ]
+ cflags = [ "/wd4334" ] # Result of 32-bit shift implicitly converted to 64 bits.
# TODO(GYP)
# Shard this taret into parts to work around linker limitations.
# on link time code generation builds.
diff --git a/third_party/WebKit/Source/platform/heap/BUILD.gn b/third_party/WebKit/Source/platform/heap/BUILD.gn
index b931f0c2..5e77093 100644
--- a/third_party/WebKit/Source/platform/heap/BUILD.gn
+++ b/third_party/WebKit/Source/platform/heap/BUILD.gn
@@ -33,10 +33,10 @@ source_set("heap") {
"PagePool.h",
"PersistentNode.cpp",
"PersistentNode.h",
- "StackFrameDepth.cpp",
- "StackFrameDepth.h",
"SafePoint.cpp",
"SafePoint.h",
+ "StackFrameDepth.cpp",
+ "StackFrameDepth.h",
"ThreadState.cpp",
"ThreadState.h",
"ThreadingTraits.h",
diff --git a/third_party/WebKit/Source/platform/heap/asm/BUILD.gn b/third_party/WebKit/Source/platform/heap/asm/BUILD.gn
index 00681e6..d3a5e6a 100644
--- a/third_party/WebKit/Source/platform/heap/asm/BUILD.gn
+++ b/third_party/WebKit/Source/platform/heap/asm/BUILD.gn
@@ -3,46 +3,49 @@
# found in the LICENSE file.
if (current_cpu == "x86" || current_cpu == "x64") {
-import("//third_party/yasm/yasm_assemble.gni")
+ import("//third_party/yasm/yasm_assemble.gni")
-yasm_assemble("asm") {
- assert(current_cpu == "x86" || current_cpu == "x64")
+ yasm_assemble("asm") {
+ assert(current_cpu == "x86" || current_cpu == "x64")
- sources = [ "SaveRegisters_x86.asm" ]
+ sources = [
+ "SaveRegisters_x86.asm",
+ ]
- yasm_flags = []
- if (is_mac) {
- # Necessary to ensure symbols end up with a _ prefix; added by
- # yasm_compile.gypi for Windows, but not Mac.
- yasm_flags += [ "-DPREFIX" ]
- }
- if (current_cpu == "x64") {
- if (is_win) {
- yasm_flags += [ "-DX64WIN=1" ]
- } else {
- yasm_flags += [ "-DX64POSIX=1" ]
+ yasm_flags = []
+ if (is_mac) {
+ # Necessary to ensure symbols end up with a _ prefix; added by
+ # yasm_compile.gypi for Windows, but not Mac.
+ yasm_flags += [ "-DPREFIX" ]
+ }
+ if (current_cpu == "x64") {
+ if (is_win) {
+ yasm_flags += [ "-DX64WIN=1" ]
+ } else {
+ yasm_flags += [ "-DX64POSIX=1" ]
+ }
+ } else { # current_cpu == "x86"
+ yasm_flags += [ "-DIA32=1" ]
}
- } else { # current_cpu == "x86"
- yasm_flags += [ "-DIA32=1" ]
- }
-}
-
-} else { # current_cpu == "x86" || current_cpu == "x64"
-
-source_set("asm") {
- if (current_cpu == "arm") {
- sources = [ "SaveRegisters_arm.S" ]
- } else if (current_cpu == "arm64") {
- sources = [ "SaveRegisters_arm64.S" ]
- } else if (current_cpu == "mipsel") {
- sources = [ "SaveRegisters_mips.S" ]
}
+} else { # current_cpu == "x86" || current_cpu == "x64"
+ source_set("asm") {
+ if (current_cpu == "arm") {
+ sources = [
+ "SaveRegisters_arm.S",
+ ]
+ } else if (current_cpu == "arm64") {
+ sources = [
+ "SaveRegisters_arm64.S",
+ ]
+ } else if (current_cpu == "mipsel") {
+ sources = [
+ "SaveRegisters_mips.S",
+ ]
+ }
- if (current_cpu == "arm") {
- defines = [ "ARM=1" ]
+ if (current_cpu == "arm") {
+ defines = [ "ARM=1" ]
+ }
}
-}
-
-} # current_cpu == "x86" || current_cpu == "x64"
-
-
+} # current_cpu == "x86" || current_cpu == "x64"
diff --git a/third_party/WebKit/Source/wtf/BUILD.gn b/third_party/WebKit/Source/wtf/BUILD.gn
index 933389c..1af070d 100644
--- a/third_party/WebKit/Source/wtf/BUILD.gn
+++ b/third_party/WebKit/Source/wtf/BUILD.gn
@@ -19,14 +19,13 @@ config("wtf_config") {
"_CRT_SECURE_NO_DEPRECATE",
"_SCL_SECURE_NO_DEPRECATE",
]
- include_dirs = [
- "os-win32",
- ]
+ include_dirs = [ "os-win32" ]
cflags = [
# Don't complain about calling specific versions of templatized
# functions (e.g. in RefPtrHashMap.h).
"/wd4344",
+
# dtoa, icu, etc. like doing assignment within conditional.
"/wd4706",
]
@@ -53,6 +52,7 @@ component("wtf") {
public_configs = [
":wtf_config",
+
# TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
"//build/config/compiler:no_size_t_to_int_warning",
"//third_party/WebKit/Source:features",
@@ -63,13 +63,9 @@ component("wtf") {
]
if (is_win) {
- sources -= [
- "ThreadingPthreads.cpp",
- ]
+ sources -= [ "ThreadingPthreads.cpp" ]
- cflags = [
- "/wd4068", # Unknown pragma.
- ]
+ cflags = [ "/wd4068" ] # Unknown pragma.
} else {
# Non-Windows.
sources -= [
@@ -86,11 +82,14 @@ component("wtf") {
}
if (is_mac) {
- libs = [ "CoreFoundation.framework", "Foundation.framework" ]
+ libs = [
+ "CoreFoundation.framework",
+ "Foundation.framework",
+ ]
} else {
sources -= [
- "text/StringImplCF.cpp",
"text/AtomicStringCF.cpp",
+ "text/StringImplCF.cpp",
]
}
}
@@ -110,7 +109,7 @@ test("wtf_unittests") {
cflags = [ "/wd4068" ] # Unknown pragma.
}
- configs += [ "//third_party/WebKit/Source:config", ]
+ configs += [ "//third_party/WebKit/Source:config" ]
deps = [
":test_support",
@@ -130,6 +129,7 @@ component("test_support") {
configs += [
":wtf_config",
+
# TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
"//build/config/compiler:no_size_t_to_int_warning",
"//third_party/WebKit/Source:config",
diff --git a/third_party/WebKit/public/BUILD.gn b/third_party/WebKit/public/BUILD.gn
index 73aefaf..f3f5115 100644
--- a/third_party/WebKit/public/BUILD.gn
+++ b/third_party/WebKit/public/BUILD.gn
@@ -6,10 +6,9 @@ import("//third_party/WebKit/Source/config.gni")
import("//tools/grit/grit_rule.gni")
blink_headers_values = exec_script("//build/gypi_to_gn.py",
- [ rebase_path("blink_headers.gypi") ],
+ [ rebase_path("blink_headers.gypi") ],
"scope",
- [ "blink_headers.gypi" ])
-
+ [ "blink_headers.gypi" ])
if (is_android) {
import("//build/config/android/rules.gni")
@@ -84,9 +83,9 @@ if (is_android) {
# GYP version: WebKit/public/blink_headers.gyp:web_text_input_type
java_cpp_enum("blink_headers_java_enums_srcjar") {
sources = [
+ "./platform/WebDisplayMode.h",
"./web/WebInputEvent.h",
"./web/WebTextInputType.h",
- "./platform/WebDisplayMode.h",
]
outputs = [
"org/chromium/blink_public/platform/WebDisplayMode.java",
@@ -98,9 +97,7 @@ if (is_android) {
# GYP version: WebKit/public/blink_headers.gyp:blink_headers_java
android_library("blink_headers_java") {
- srcjar_deps = [
- ":blink_headers_java_enums_srcjar",
- ]
+ srcjar_deps = [ ":blink_headers_java_enums_srcjar" ]
}
}
@@ -109,8 +106,10 @@ if (is_android) {
source_set("blink_headers") {
public_configs = [
":blink_headers_config",
+
# Blink exposes icu headers in the public API.
"//third_party/icu:icu_config",
+
# Blink exposes NPAPI headers in the public API.
"//third_party/npapi:npapi_config",
]
diff --git a/third_party/cld_2/BUILD.gn b/third_party/cld_2/BUILD.gn
index 70dc872..4321701 100644
--- a/third_party/cld_2/BUILD.gn
+++ b/third_party/cld_2/BUILD.gn
@@ -98,6 +98,7 @@ config("cld2_warnings") {
# cld_2 contains unused private fields.
# https://code.google.com/p/cld2/issues/detail?id=37
"-Wno-unused-private-field",
+
# offsetmap.cc uses a char as a subscript.
"-Wno-char-subscripts",
]
diff --git a/third_party/freetype-android/BUILD.gn b/third_party/freetype-android/BUILD.gn
index eb8f12d..db8c629 100644
--- a/third_party/freetype-android/BUILD.gn
+++ b/third_party/freetype-android/BUILD.gn
@@ -42,6 +42,7 @@ source_set("freetype") {
defines = [
"FT2_BUILD_LIBRARY",
"DARWIN_NO_CARBON",
+
# Long directory name to avoid accidentally using wrong headers.
"FT_CONFIG_MODULES_H=<freetype-android-config/ftmodule.h>",
"FT_CONFIG_OPTIONS_H=<freetype-android-config/ftoption.h>",
diff --git a/third_party/harfbuzz-ng/BUILD.gn b/third_party/harfbuzz-ng/BUILD.gn
index 24aa16f..87f51ac 100644
--- a/third_party/harfbuzz-ng/BUILD.gn
+++ b/third_party/harfbuzz-ng/BUILD.gn
@@ -62,12 +62,10 @@ if (use_system_harfbuzz) {
# See also chrome/browser/ui/libgtk2ui/BUILD.gn which pulls this.
config("pangoft2_link_hack") {
if (is_linux && use_pango && !is_chromeos && !is_official_build &&
- current_cpu != "arm" && current_cpu != "mipsel" &&
- !is_component_build) {
+ current_cpu != "arm" && current_cpu != "mipsel" && !is_component_build) {
# These symbols are referenced from libpangoft2, which will be
# dynamically linked later.
- ldflags =
- [ "-Wl,-uhb_ft_face_create_cached,-uhb_glib_get_unicode_funcs" ]
+ ldflags = [ "-Wl,-uhb_ft_face_create_cached,-uhb_glib_get_unicode_funcs" ]
}
}
@@ -215,6 +213,5 @@ if (use_system_harfbuzz) {
"src/hb-glib.h",
]
}
-
}
}
diff --git a/third_party/mojo/src/mojo/public/cpp/utility/BUILD.gn b/third_party/mojo/src/mojo/public/cpp/utility/BUILD.gn
index 9660a07..96c1d11 100644
--- a/third_party/mojo/src/mojo/public/cpp/utility/BUILD.gn
+++ b/third_party/mojo/src/mojo/public/cpp/utility/BUILD.gn
@@ -6,16 +6,16 @@ import("../../mojo_sdk.gni")
mojo_sdk_source_set("utility") {
sources = [
- "mutex.h",
- "run_loop.h",
- "run_loop_handler.h",
- "thread.h",
"lib/mutex.cc",
"lib/run_loop.cc",
"lib/thread.cc",
"lib/thread_local.h",
"lib/thread_local_posix.cc",
"lib/thread_local_win.cc",
+ "mutex.h",
+ "run_loop.h",
+ "run_loop_handler.h",
+ "thread.h",
]
mojo_sdk_deps = [
@@ -26,10 +26,10 @@ mojo_sdk_source_set("utility") {
if (is_win) {
# See crbug.com/342893:
sources -= [
- "mutex.h",
- "thread.h",
"lib/mutex.cc",
"lib/thread.cc",
+ "mutex.h",
+ "thread.h",
]
}
}
diff --git a/third_party/zlib/BUILD.gn b/third_party/zlib/BUILD.gn
index 161d4f5..a83d355 100644
--- a/third_party/zlib/BUILD.gn
+++ b/third_party/zlib/BUILD.gn
@@ -29,8 +29,7 @@ static_library("zlib_x86_simd") {
}
config("zlib_warnings") {
- if (is_clang && !is_ios &&
- (current_cpu == "x86" || current_cpu == "x64")) {
+ if (is_clang && !is_ios && (current_cpu == "x86" || current_cpu == "x64")) {
cflags = [ "-Wno-incompatible-pointer-types" ]
}
}
diff --git a/ui/resources/BUILD.gn b/ui/resources/BUILD.gn
index 48a23aee..414f145 100644
--- a/ui/resources/BUILD.gn
+++ b/ui/resources/BUILD.gn
@@ -88,7 +88,9 @@ if (is_ios || is_mac) {
# This group exists just for targets that need the data file
# to exist in the build directory so it can be loaded for test purposes.
group("ui_test_pak_data") {
- data_deps = [ ":repack_ui_test_pak" ]
+ data_deps = [
+ ":repack_ui_test_pak",
+ ]
}
# GYP version: ui/resources/ui_resources.gyp:ui_test_pak
diff --git a/ui/touch_selection/BUILD.gn b/ui/touch_selection/BUILD.gn
index dd40269..b8d8d40 100644
--- a/ui/touch_selection/BUILD.gn
+++ b/ui/touch_selection/BUILD.gn
@@ -95,7 +95,9 @@ test("ui_touch_selection_unittests") {
"//ui/gfx:test_support",
]
- data_deps = [ "//third_party/mesa:osmesa" ]
+ data_deps = [
+ "//third_party/mesa:osmesa",
+ ]
}
if (is_android) {
diff --git a/ui/wm/BUILD.gn b/ui/wm/BUILD.gn
index 15d39cd..1c11375 100644
--- a/ui/wm/BUILD.gn
+++ b/ui/wm/BUILD.gn
@@ -169,5 +169,7 @@ test("wm_unittests") {
"//ui/gl",
]
- data_deps = [ "//ui/resources:ui_test_pak_data" ]
+ data_deps = [
+ "//ui/resources:ui_test_pak_data",
+ ]
}