diff options
author | jamesr <jamesr@chromium.org> | 2014-12-03 19:22:06 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-12-04 03:22:37 +0000 |
commit | 7c42557da8899c054d54fbc074f4cb19b8124bfc (patch) | |
tree | e7a2c24a5d95680be5ad2f1fdc4b464954c73cd9 /mojo | |
parent | 91af3ad699d1067d8398b42a6f1fad737b95b12b (diff) | |
download | chromium_src-7c42557da8899c054d54fbc074f4cb19b8124bfc.zip chromium_src-7c42557da8899c054d54fbc074f4cb19b8124bfc.tar.gz chromium_src-7c42557da8899c054d54fbc074f4cb19b8124bfc.tar.bz2 |
Run gn format on //mojo/**/BUILD.gn
The files under //mojo/public, //mojo/edk and //mojo/services/public
will be pulled down from the mojo repo, where they're already formatted,
but the other files are not updated and need to be formatted in chromium.
This just formats the whole lot - the ones in //mojo/public etc will be
written over by the next mojo roll but that's fine.
BUG=348474
R=scottmg@chromium.org
Review URL: https://codereview.chromium.org/779813002
Cr-Commit-Position: refs/heads/master@{#306756}
Diffstat (limited to 'mojo')
33 files changed, 141 insertions, 90 deletions
diff --git a/mojo/BUILD.gn b/mojo/BUILD.gn index 3a287f0..adab3e7 100644 --- a/mojo/BUILD.gn +++ b/mojo/BUILD.gn @@ -15,9 +15,7 @@ group("mojo") { ] if (is_android) { - deps += [ - "//mojo/android", - ] + deps += [ "//mojo/android" ] } } diff --git a/mojo/application/BUILD.gn b/mojo/application/BUILD.gn index 601391f..fc8d376 100644 --- a/mojo/application/BUILD.gn +++ b/mojo/application/BUILD.gn @@ -21,8 +21,14 @@ source_set("application") { source_set("test_support") { testonly = true - sources = [ "application_test_main_chromium.cc" ] + sources = [ + "application_test_main_chromium.cc", + ] - public_deps = [ "//mojo/public/cpp/application:test_support" ] - deps = [ "//base" ] + public_deps = [ + "//mojo/public/cpp/application:test_support", + ] + deps = [ + "//base", + ] } diff --git a/mojo/converters/geometry/BUILD.gn b/mojo/converters/geometry/BUILD.gn index 2d0a1e0..958cb00 100644 --- a/mojo/converters/geometry/BUILD.gn +++ b/mojo/converters/geometry/BUILD.gn @@ -17,9 +17,7 @@ component("geometry") { "//mojo/services/public/interfaces/geometry", ] - defines = [ - "MOJO_GEOMETRY_IMPLEMENTATION", - ] + defines = [ "MOJO_GEOMETRY_IMPLEMENTATION" ] sources = [ "geometry_type_converters.cc", diff --git a/mojo/converters/input_events/BUILD.gn b/mojo/converters/input_events/BUILD.gn index 94df786..e3cb5d9 100644 --- a/mojo/converters/input_events/BUILD.gn +++ b/mojo/converters/input_events/BUILD.gn @@ -11,9 +11,7 @@ component("input_events") { "mojo_input_events_export.h", ] - defines = [ - "MOJO_INPUT_EVENTS_IMPLEMENTATION", - ] + defines = [ "MOJO_INPUT_EVENTS_IMPLEMENTATION" ] deps = [ "//base", diff --git a/mojo/converters/surfaces/tests/BUILD.gn b/mojo/converters/surfaces/tests/BUILD.gn index 4f09c5c..0de66f8 100644 --- a/mojo/converters/surfaces/tests/BUILD.gn +++ b/mojo/converters/surfaces/tests/BUILD.gn @@ -23,5 +23,7 @@ test("mojo_surfaces_lib_unittests") { "//ui/gfx:test_support", ] - sources = [ "surface_unittest.cc" ] + sources = [ + "surface_unittest.cc", + ] } diff --git a/mojo/edk/embedder/BUILD.gn b/mojo/edk/embedder/BUILD.gn index 3bd9df0..5271e66 100644 --- a/mojo/edk/embedder/BUILD.gn +++ b/mojo/edk/embedder/BUILD.gn @@ -16,6 +16,7 @@ source_set("embedder") { "embedder.h", "embedder_internal.h", "entrypoints.cc", + # Test-only code: # TODO(vtl): It's a little unfortunate that these end up in the same # component as non-test-only code. In the static build, this code should @@ -36,7 +37,9 @@ source_set("embedder") { "//mojo/public/cpp/system", ] - deps = [ "//base" ] + deps = [ + "//base", + ] } source_set("platform") { @@ -75,7 +78,9 @@ source_set("platform") { configs += [ "//mojo/edk/system:system_config" ] - deps = [ "//base" ] + deps = [ + "//base", + ] } source_set("embedder_unittests") { diff --git a/mojo/edk/js/BUILD.gn b/mojo/edk/js/BUILD.gn index e652b80..5a7e3d5 100644 --- a/mojo/edk/js/BUILD.gn +++ b/mojo/edk/js/BUILD.gn @@ -45,5 +45,4 @@ source_set("js_unittests") { "//mojo/public/cpp/system", "//testing/gtest", ] - } diff --git a/mojo/edk/js/test/BUILD.gn b/mojo/edk/js/test/BUILD.gn index e63704b..be3a641 100644 --- a/mojo/edk/js/test/BUILD.gn +++ b/mojo/edk/js/test/BUILD.gn @@ -17,7 +17,9 @@ test("js_unittests") { "//mojo/public/interfaces/bindings/tests:test_interfaces", ] - sources = [ "run_js_tests.cc" ] + sources = [ + "run_js_tests.cc", + ] } test("js_integration_tests") { @@ -34,6 +36,6 @@ test("js_integration_tests") { ] sources = [ - "run_js_integration_tests.cc" + "run_js_integration_tests.cc", ] } diff --git a/mojo/edk/js/tests/BUILD.gn b/mojo/edk/js/tests/BUILD.gn index c61ba37..c7f568b 100644 --- a/mojo/edk/js/tests/BUILD.gn +++ b/mojo/edk/js/tests/BUILD.gn @@ -23,5 +23,7 @@ source_set("js_to_cpp_tests") { } mojom("js_to_cpp_bindings") { - sources = [ "js_to_cpp.mojom" ] + sources = [ + "js_to_cpp.mojom", + ] } diff --git a/mojo/edk/system/BUILD.gn b/mojo/edk/system/BUILD.gn index 0701484..8cc8905 100644 --- a/mojo/edk/system/BUILD.gn +++ b/mojo/edk/system/BUILD.gn @@ -130,6 +130,7 @@ test("mojo_system_unittests") { "run_all_unittests.cc", "shared_buffer_dispatcher_unittest.cc", "simple_dispatcher_unittest.cc", + # TODO(vtl): Factor test_utils.* into their own source set. "test_utils.cc", "test_utils.h", @@ -149,9 +150,7 @@ test("mojo_system_unittests") { ] if (is_android) { - deps += [ - "//testing/android:native_test_native_code", - ] + deps += [ "//testing/android:native_test_native_code" ] } allow_circular_includes_from = [ "//mojo/edk/embedder:embedder_unittests" ] diff --git a/mojo/edk/test/BUILD.gn b/mojo/edk/test/BUILD.gn index 38a631b..42e8c03 100644 --- a/mojo/edk/test/BUILD.gn +++ b/mojo/edk/test/BUILD.gn @@ -33,7 +33,9 @@ source_set("run_all_unittests") { "//testing/gtest", ] - sources = [ "run_all_unittests.cc" ] + sources = [ + "run_all_unittests.cc", + ] } # GYP version: mojo/edk/mojo_edk.gyp:mojo_run_all_perftests @@ -47,10 +49,11 @@ source_set("run_all_perftests") { "//mojo/public/c/test_support", ] - sources = [ "run_all_perftests.cc" ] + sources = [ + "run_all_perftests.cc", + ] } - # GYP version: mojo/edk/mojo_edk.gyp:mojo_test_support_impl source_set("test_support_impl") { testonly = true diff --git a/mojo/environment/BUILD.gn b/mojo/environment/BUILD.gn index 804a951..e10850a 100644 --- a/mojo/environment/BUILD.gn +++ b/mojo/environment/BUILD.gn @@ -8,6 +8,7 @@ source_set("chromium") { sources = [ "environment.cc", + # TODO(vtl): This is kind of ugly. (See TODO in logging.h.) "../public/cpp/environment/logging.h", "../public/cpp/environment/lib/logging.cc", @@ -32,9 +33,7 @@ component("chromium_impl") { "default_run_loop_impl.h", ] - defines = [ - "MOJO_ENVIRONMENT_IMPL_IMPLEMENTATION", - ] + defines = [ "MOJO_ENVIRONMENT_IMPL_IMPLEMENTATION" ] deps = [ "//base", diff --git a/mojo/public/BUILD.gn b/mojo/public/BUILD.gn index 6d8077b..4cc5548 100644 --- a/mojo/public/BUILD.gn +++ b/mojo/public/BUILD.gn @@ -19,15 +19,11 @@ group("public") { ] if (is_linux) { - deps += [ - "//mojo/public/python", - ] + deps += [ "//mojo/public/python" ] } if (mojo_use_dart) { - deps += [ - "//mojo/public/dart", - ] + deps += [ "//mojo/public/dart" ] } if (is_android) { @@ -52,5 +48,7 @@ group("sdk") { static_library("libmojo_sdk") { complete_static_lib = true - deps = [ ":sdk" ] + deps = [ + ":sdk", + ] } diff --git a/mojo/public/c/environment/BUILD.gn b/mojo/public/c/environment/BUILD.gn index 669da7d..26e8256 100644 --- a/mojo/public/c/environment/BUILD.gn +++ b/mojo/public/c/environment/BUILD.gn @@ -8,5 +8,7 @@ source_set("environment") { "logger.h", ] - deps = [ "//mojo/public/c/system" ] + deps = [ + "//mojo/public/c/system", + ] } diff --git a/mojo/public/c/system/BUILD.gn b/mojo/public/c/system/BUILD.gn index b47b3da9..b12755f 100644 --- a/mojo/public/c/system/BUILD.gn +++ b/mojo/public/c/system/BUILD.gn @@ -32,17 +32,27 @@ source_set("system") { # //mojo/public/c/system:for_shared_library to your deps group("for_shared_library") { - public_deps = [ ":system" ] + public_deps = [ + ":system", + ] if (is_component_build) { - deps = [ "//mojo/edk/system" ] + deps = [ + "//mojo/edk/system", + ] } else { - deps = [ "//mojo/public/platform/native:system_thunks" ] + deps = [ + "//mojo/public/platform/native:system_thunks", + ] } } group("for_component") { - public_deps = [ ":system" ] + public_deps = [ + ":system", + ] if (is_component_build) { - deps = [ "//mojo/edk/system" ] + deps = [ + "//mojo/edk/system", + ] } } diff --git a/mojo/public/c/test_support/BUILD.gn b/mojo/public/c/test_support/BUILD.gn index 2129c90..3b11a60 100644 --- a/mojo/public/c/test_support/BUILD.gn +++ b/mojo/public/c/test_support/BUILD.gn @@ -11,14 +11,15 @@ shared_library("test_support") { sources = [ "test_support.h", "test_support_export.h", + # TODO(vtl): Convert this to thunks http://crbug.com/386799 "../../tests/test_support_private.cc", "../../tests/test_support_private.h", ] if (is_mac) { -# TODO(GYP) -# # Make it a run-path dependent library. -# 'DYLIB_INSTALL_NAME_BASE': '@loader_path', + # TODO(GYP) + # # Make it a run-path dependent library. + # 'DYLIB_INSTALL_NAME_BASE': '@loader_path', } } diff --git a/mojo/public/cpp/application/BUILD.gn b/mojo/public/cpp/application/BUILD.gn index ad46086..b224c4a 100644 --- a/mojo/public/cpp/application/BUILD.gn +++ b/mojo/public/cpp/application/BUILD.gn @@ -35,10 +35,12 @@ source_set("application") { # GYP version: mojo/public/mojo_public.gyp:mojo_application_standalone source_set("standalone") { sources = [ - "lib/application_runner.cc" + "lib/application_runner.cc", ] - public_deps = [ ":application" ] + public_deps = [ + ":application", + ] deps = [ "//mojo/public/cpp/environment:standalone", @@ -64,9 +66,13 @@ source_set("test_support") { source_set("test_support_standalone") { testonly = true - sources = [ "lib/application_test_main.cc" ] + sources = [ + "lib/application_test_main.cc", + ] - public_deps = [ ":test_support" ] + public_deps = [ + ":test_support", + ] deps = [ ":application", "//mojo/public/cpp/environment:standalone", diff --git a/mojo/public/cpp/application/tests/BUILD.gn b/mojo/public/cpp/application/tests/BUILD.gn index 61678ab..64c477e 100644 --- a/mojo/public/cpp/application/tests/BUILD.gn +++ b/mojo/public/cpp/application/tests/BUILD.gn @@ -13,5 +13,7 @@ test("mojo_public_application_unittests") { "//testing/gtest", ] - sources = [ "service_registry_unittest.cc" ] + sources = [ + "service_registry_unittest.cc", + ] } diff --git a/mojo/public/cpp/bindings/BUILD.gn b/mojo/public/cpp/bindings/BUILD.gn index 143ab83..4299fc6 100644 --- a/mojo/public/cpp/bindings/BUILD.gn +++ b/mojo/public/cpp/bindings/BUILD.gn @@ -69,5 +69,7 @@ source_set("callback") { "lib/shared_ptr.h", ] - deps = [ "//mojo/public/cpp/system" ] + deps = [ + "//mojo/public/cpp/system", + ] } diff --git a/mojo/public/cpp/environment/BUILD.gn b/mojo/public/cpp/environment/BUILD.gn index cc7bb31..f322c55 100644 --- a/mojo/public/cpp/environment/BUILD.gn +++ b/mojo/public/cpp/environment/BUILD.gn @@ -9,7 +9,9 @@ source_set("environment") { "environment.h", ] - public_deps = [ "//mojo/public/c/environment" ] + public_deps = [ + "//mojo/public/c/environment", + ] deps = [ "//mojo/public/cpp/bindings:callback", @@ -28,7 +30,9 @@ source_set("standalone") { "lib/logging.cc", ] - public_deps = [ ":environment" ] + public_deps = [ + ":environment", + ] deps = [ "//mojo/public/c/environment", diff --git a/mojo/public/cpp/system/BUILD.gn b/mojo/public/cpp/system/BUILD.gn index 046ede0..91b8b28 100644 --- a/mojo/public/cpp/system/BUILD.gn +++ b/mojo/public/cpp/system/BUILD.gn @@ -10,8 +10,10 @@ source_set("system") { "functions.h", "handle.h", "macros.h", - "message_pipe.h" + "message_pipe.h", ] - public_deps = [ "//mojo/public/c/system" ] + public_deps = [ + "//mojo/public/c/system", + ] } diff --git a/mojo/public/dart/BUILD.gn b/mojo/public/dart/BUILD.gn index 0acb310..ce9373d 100644 --- a/mojo/public/dart/BUILD.gn +++ b/mojo/public/dart/BUILD.gn @@ -10,7 +10,6 @@ group("dart") { ] } - group("core") { deps = [ ":mojo_dart_core", @@ -18,9 +17,8 @@ group("core") { ] } - shared_library("mojo_dart_core") { - defines = ["DART_SHARED_LIB"] + defines = [ "DART_SHARED_LIB" ] sources = [ "src/mojo_dart_core.cc", ] @@ -34,20 +32,18 @@ shared_library("mojo_dart_core") { ] } - copy("copy_core_library") { sources = [ "$root_out_dir/libmojo_dart_core.so", ] outputs = [ - "$root_out_dir/gen/mojo/public/dart/src/libmojo_dart_core.so" + "$root_out_dir/gen/mojo/public/dart/src/libmojo_dart_core.so", ] - deps =[ - ":mojo_dart_core" + deps = [ + ":mojo_dart_core", ] } - copy("bindings") { sources = [ "bindings.dart", @@ -64,6 +60,6 @@ copy("bindings") { "src/types.dart", ] outputs = [ - "{{source_gen_dir}}/{{source_file_part}}" + "{{source_gen_dir}}/{{source_file_part}}", ] -}
\ No newline at end of file +} diff --git a/mojo/public/gles2/BUILD.gn b/mojo/public/gles2/BUILD.gn index 5c21e78..79e7bde 100644 --- a/mojo/public/gles2/BUILD.gn +++ b/mojo/public/gles2/BUILD.gn @@ -16,20 +16,30 @@ group("for_shared_library") { public_configs = [ "//third_party/khronos:khronos_headers" ] - public_deps = [ "//mojo/public/c/gles2" ] + public_deps = [ + "//mojo/public/c/gles2", + ] if (is_component_build) { - deps = [ "//mojo/gles2" ] + deps = [ + "//mojo/gles2", + ] } else { - deps = [ "//mojo/public/platform/native:gles2_thunks" ] + deps = [ + "//mojo/public/platform/native:gles2_thunks", + ] } } group("for_component") { public_configs = [ "//third_party/khronos:khronos_headers" ] - public_deps = [ "//mojo/public/c/gles2" ] + public_deps = [ + "//mojo/public/c/gles2", + ] if (is_component_build) { - deps = [ "//mojo/gles2" ] + deps = [ + "//mojo/gles2", + ] } } diff --git a/mojo/public/java/BUILD.gn b/mojo/public/java/BUILD.gn index 6f5d8e9..04d2ef6 100644 --- a/mojo/public/java/BUILD.gn +++ b/mojo/public/java/BUILD.gn @@ -3,7 +3,7 @@ # found in the LICENSE file. import("//build/config/android/rules.gni") - + android_library("system") { java_files = [ "system/src/org/chromium/mojo/system/AsyncWaiter.java", @@ -49,5 +49,7 @@ android_library("bindings") { "bindings/src/org/chromium/mojo/bindings/Struct.java", ] - deps = [ ":system" ] + deps = [ + ":system", + ] } diff --git a/mojo/public/platform/native/BUILD.gn b/mojo/public/platform/native/BUILD.gn index e7919ae..63a0136 100644 --- a/mojo/public/platform/native/BUILD.gn +++ b/mojo/public/platform/native/BUILD.gn @@ -13,7 +13,9 @@ source_set("system_thunks") { "system_thunks.cc", ] defines = [ "MOJO_SYSTEM_IMPLEMENTATION" ] - deps = [ "//mojo/public/c/system" ] + deps = [ + "//mojo/public/c/system", + ] # The GYP target analogous to this one builds this code into a # static library. When building for Android, both the GYP and GN @@ -40,9 +42,7 @@ source_set("gles2_thunks") { "gles2_impl_chromium_sync_point_thunks.h", ] - defines = [ - "MOJO_GLES2_IMPLEMENTATION", - ] + defines = [ "MOJO_GLES2_IMPLEMENTATION" ] configs += [ "//third_party/khronos:khronos_headers" ] diff --git a/mojo/public/sky/BUILD.gn b/mojo/public/sky/BUILD.gn index 2d34c93..c3b5366 100644 --- a/mojo/public/sky/BUILD.gn +++ b/mojo/public/sky/BUILD.gn @@ -20,6 +20,6 @@ action_foreach("sky") { "--input", "{{source}}", "--output", - rebase_path(target_gen_dir, root_build_dir) + "/{{source_name_part}}.sky" + rebase_path(target_gen_dir, root_build_dir) + "/{{source_name_part}}.sky", ] } diff --git a/mojo/public/tools/BUILD.gn b/mojo/public/tools/BUILD.gn index 6405c54..5fb9785 100644 --- a/mojo/public/tools/BUILD.gn +++ b/mojo/public/tools/BUILD.gn @@ -10,7 +10,11 @@ if (use_prebuilt_mojo_shell) { if (is_win) { filename += ".exe" } - sources = [ "prebuilt/$filename" ] - outputs = [ "$root_out_dir/$filename" ] + sources = [ + "prebuilt/$filename", + ] + outputs = [ + "$root_out_dir/$filename", + ] } } diff --git a/mojo/services/BUILD.gn b/mojo/services/BUILD.gn index e0bdc4a..30df19c 100644 --- a/mojo/services/BUILD.gn +++ b/mojo/services/BUILD.gn @@ -22,12 +22,10 @@ group("services") { "//mojo/services/html_viewer", "//mojo/services/network", ] - + # TODO(GYP): Make this work. if (is_mac) { - deps -= [ - "//mojo/services/html_viewer", - ] + deps -= [ "//mojo/services/html_viewer" ] } } } diff --git a/mojo/services/network/BUILD.gn b/mojo/services/network/BUILD.gn index b2aa904..4a85af0 100644 --- a/mojo/services/network/BUILD.gn +++ b/mojo/services/network/BUILD.gn @@ -16,7 +16,9 @@ mojo_native_application("network") { "//mojo/services/public/interfaces/network", ] - sources = [ "network_service.cc" ] + sources = [ + "network_service.cc", + ] } source_set("lib") { diff --git a/mojo/services/public/cpp/geometry/BUILD.gn b/mojo/services/public/cpp/geometry/BUILD.gn index bf2b577..349a865 100644 --- a/mojo/services/public/cpp/geometry/BUILD.gn +++ b/mojo/services/public/cpp/geometry/BUILD.gn @@ -7,5 +7,7 @@ source_set("geometry") { "geometry_util.h", ] - deps = [ "//mojo/services/public/interfaces/geometry" ] + deps = [ + "//mojo/services/public/interfaces/geometry", + ] } diff --git a/mojo/services/public/cpp/view_manager/lib/BUILD.gn b/mojo/services/public/cpp/view_manager/lib/BUILD.gn index 9e8270e..2090455 100644 --- a/mojo/services/public/cpp/view_manager/lib/BUILD.gn +++ b/mojo/services/public/cpp/view_manager/lib/BUILD.gn @@ -18,6 +18,6 @@ source_set("run_unittests") { ] if (use_x11) { - deps += ["//ui/gfx/x"] + deps += [ "//ui/gfx/x" ] } } diff --git a/mojo/services/public/interfaces/gpu/BUILD.gn b/mojo/services/public/interfaces/gpu/BUILD.gn index 8fe2f9c..26d2dbd 100644 --- a/mojo/services/public/interfaces/gpu/BUILD.gn +++ b/mojo/services/public/interfaces/gpu/BUILD.gn @@ -6,10 +6,10 @@ import("//mojo/public/tools/bindings/mojom.gni") mojom("gpu") { sources = [ - "command_buffer.mojom", - "gpu.mojom", - "gpu_capabilities.mojom", - "viewport_parameter_listener.mojom", + "command_buffer.mojom", + "gpu.mojom", + "gpu_capabilities.mojom", + "viewport_parameter_listener.mojom", ] deps = [ diff --git a/mojo/services/public/interfaces/surfaces/BUILD.gn b/mojo/services/public/interfaces/surfaces/BUILD.gn index e2b576ef..5d589a0 100644 --- a/mojo/services/public/interfaces/surfaces/BUILD.gn +++ b/mojo/services/public/interfaces/surfaces/BUILD.gn @@ -19,7 +19,6 @@ mojom("surfaces") { ] } - mojom("surface_id") { sources = [ "surface_id.mojom", |