diff options
author | Rob Mohr <mohrr@google.com> | 2020-02-27 11:43:49 -0800 |
---|---|---|
committer | CQ Bot Account <commit-bot@chromium.org> | 2020-02-28 01:33:18 +0000 |
commit | a0ba54f64805b5b156ef7fe00c543a910e31bd7d (patch) | |
tree | dbffeb942349f329e286544354a37bc08edc7f31 | |
parent | 7862749df0a2e9e328637693b5c81ec091ac631f (diff) | |
download | pigweed-a0ba54f64805b5b156ef7fe00c543a910e31bd7d.tar.gz |
Roll GN to 239533d
This caused gn format to flag many things which were also fixed.
Change-Id: Ie1d9081a1b08047bec52c60f54d2a94366be1ba6
50 files changed, 207 insertions, 580 deletions
diff --git a/docs/BUILD.gn b/docs/BUILD.gn index ea7f494f5..8d5b7c8ed 100644 --- a/docs/BUILD.gn +++ b/docs/BUILD.gn @@ -23,9 +23,7 @@ pw_doc_group("core_docs") { # Documentation for upstream Pigweed targets. group("target_docs") { - deps = [ - "$dir_pigweed/targets/stm32f429i-disc1:target_docs", - ] + deps = [ "$dir_pigweed/targets/stm32f429i-disc1:target_docs" ] } pw_doc_gen("docs") { diff --git a/pw_assert/BUILD.gn b/pw_assert/BUILD.gn index 2e60199fc..ab55707ce 100644 --- a/pw_assert/BUILD.gn +++ b/pw_assert/BUILD.gn @@ -23,12 +23,8 @@ config("default_config") { pw_facade("pw_assert") { backend = dir_pw_assert_backend public_configs = [ ":default_config" ] - public = [ - "public/pw_assert/assert.h", - ] - public_deps = [ - dir_pw_preprocessor, - ] + public = [ "public/pw_assert/assert.h" ] + public_deps = [ dir_pw_preprocessor ] } pw_test_group("tests") { @@ -53,7 +49,5 @@ if (dir_pw_assert_backend != "") { } pw_doc_group("docs") { - sources = [ - "docs.rst", - ] + sources = [ "docs.rst" ] } diff --git a/pw_assert_basic/BUILD.gn b/pw_assert_basic/BUILD.gn index f9f77e0cf..dab76066f 100644 --- a/pw_assert_basic/BUILD.gn +++ b/pw_assert_basic/BUILD.gn @@ -26,12 +26,8 @@ if (dir_pw_assert_backend == dir_pw_assert_basic) { ":backend_config", ":default_config", ] - deps = [ - ":core", - ] - public = [ - "public_overrides/pw_assert_backend/assert_backend.h", - ] + deps = [ ":core" ] + public = [ "public_overrides/pw_assert_backend/assert_backend.h" ] sources = public } } @@ -44,8 +40,6 @@ source_set("core") { "$dir_pw_preprocessor", "$dir_pw_string", ] - public = [ - "public/pw_assert_basic/assert_basic.h", - ] + public = [ "public/pw_assert_basic/assert_basic.h" ] sources = public + [ "assert_basic.cc" ] } diff --git a/pw_base64/BUILD.gn b/pw_base64/BUILD.gn index e69421d2d..eec8d3176 100644 --- a/pw_base64/BUILD.gn +++ b/pw_base64/BUILD.gn @@ -20,16 +20,10 @@ config("default_config") { source_set("pw_base64") { public_configs = [ ":default_config" ] - public = [ - "public/pw_base64/base64.h", - ] - sources = [ - "base64.cc", - ] + public = [ "public/pw_base64/base64.h" ] + sources = [ "base64.cc" ] sources += public - public_deps = [ - "$dir_pw_span", - ] + public_deps = [ "$dir_pw_span" ] } pw_test_group("tests") { @@ -38,9 +32,7 @@ pw_test_group("tests") { } pw_test("base64_test") { - deps = [ - ":pw_base64", - ] + deps = [ ":pw_base64" ] sources = [ "base64_test.c", "base64_test.cc", diff --git a/pw_bloat/BUILD.gn b/pw_bloat/BUILD.gn index c98f611e9..9a15a9cf4 100644 --- a/pw_bloat/BUILD.gn +++ b/pw_bloat/BUILD.gn @@ -24,9 +24,7 @@ config("default_config") { # from showing up within bloat diff reports. source_set("bloat_this_binary") { public_configs = [ ":default_config" ] - public = [ - "public/pw_bloat/bloat_this_binary.h", - ] + public = [ "public/pw_bloat/bloat_this_binary.h" ] sources = [ "bloat_this_binary.cc" ] + public } @@ -36,11 +34,9 @@ pw_executable("bloat_base") { } pw_doc_group("docs") { - sources = [ - "docs.rst", - ] + sources = [ "docs.rst" ] report_deps = [ - "examples:simple_bloat_loop", "examples:simple_bloat_function", + "examples:simple_bloat_loop", ] } diff --git a/pw_bloat/bloat.gni b/pw_bloat/bloat.gni index d71159859..87c1cc816 100644 --- a/pw_bloat/bloat.gni +++ b/pw_bloat/bloat.gni @@ -280,9 +280,7 @@ template("pw_toolchain_size_report") { } script = "$dir_pw_bloat/py/no_toolchains.py" args = [ _doc_rst_output ] - outputs = [ - _doc_rst_output, - ] + outputs = [ _doc_rst_output ] } } } @@ -291,10 +289,6 @@ template("pw_toolchain_size_report") { # main() function that loads the bloat_this_binary library and does nothing # else. pw_bloat_empty_base = { - deps = [ - "$dir_pw_bloat:bloat_this_binary", - ] - sources = [ - "$dir_pw_bloat/base_main.cc", - ] + deps = [ "$dir_pw_bloat:bloat_this_binary" ] + sources = [ "$dir_pw_bloat/base_main.cc" ] } diff --git a/pw_bloat/examples/BUILD.gn b/pw_bloat/examples/BUILD.gn index eece11665..4b289ec5a 100644 --- a/pw_bloat/examples/BUILD.gn +++ b/pw_bloat/examples/BUILD.gn @@ -16,26 +16,18 @@ import("../bloat.gni") pw_toolchain_size_report("simple_bloat_loop") { base_executable = { - sources = [ - "simple_base.cc", - ] + sources = [ "simple_base.cc" ] } diff_executable = { - sources = [ - "simple_loop.cc", - ] + sources = [ "simple_loop.cc" ] } } pw_toolchain_size_report("simple_bloat_function") { base_executable = { - sources = [ - "simple_base.cc", - ] + sources = [ "simple_base.cc" ] } diff_executable = { - sources = [ - "simple_function.cc", - ] + sources = [ "simple_function.cc" ] } } diff --git a/pw_boot_armv7m/BUILD.gn b/pw_boot_armv7m/BUILD.gn index 6376d58fc..f72ed7704 100644 --- a/pw_boot_armv7m/BUILD.gn +++ b/pw_boot_armv7m/BUILD.gn @@ -34,15 +34,11 @@ if (dir_pw_boot_backend == dir_pw_boot_armv7m) { ":armv7m_linker_script", "$dir_pw_preprocessor", ] - public = [ - "public/pw_boot_armv7m/boot.h", - ] + public = [ "public/pw_boot_armv7m/boot.h" ] sources = [ "core_init.c" ] + public } } pw_doc_group("docs") { - sources = [ - "docs.rst", - ] + sources = [ "docs.rst" ] } diff --git a/pw_build/BUILD.gn b/pw_build/BUILD.gn index a32e49cdd..343a14ca1 100644 --- a/pw_build/BUILD.gn +++ b/pw_build/BUILD.gn @@ -70,9 +70,7 @@ config("cpp17") { } pw_doc_group("docs") { - sources = [ - "docs.rst", - ] + sources = [ "docs.rst" ] } # Pool to limit a single thread to download external Go packages at a time. diff --git a/pw_build/go.gni b/pw_build/go.gni index b0433b632..bc1efe3a6 100644 --- a/pw_build/go.gni +++ b/pw_build/go.gni @@ -100,9 +100,7 @@ template("pw_go_executable") { generated_file(_metadata_target_name) { deps = invoker.deps data_keys = [ "gopath" ] - outputs = [ - _metadata_file, - ] + outputs = [ _metadata_file ] } # Collect all of the external dependencies of the executable and its packages. @@ -111,9 +109,7 @@ template("pw_go_executable") { generated_file(_deps_metadata_target_name) { deps = invoker.deps data_keys = [ "external_deps" ] - outputs = [ - _deps_metadata_file, - ] + outputs = [ _deps_metadata_file ] } _default_gopath = rebase_path("$root_gen_dir/go") diff --git a/pw_build/linker_script.gni b/pw_build/linker_script.gni index 8c711ea3c..7c5abf204 100644 --- a/pw_build/linker_script.gni +++ b/pw_build/linker_script.gni @@ -64,9 +64,7 @@ template("pw_linker_script") { # linker script. pw_exec("${target_name}_preprocess") { program = pw_cc_command - inputs = [ - invoker.linker_script, - ] + inputs = [ invoker.linker_script ] args = [ # Run compiler in preprocessor-only mode. "-E", @@ -98,17 +96,13 @@ template("pw_linker_script") { "-o", _final_linker_script, ] - outputs = [ - _final_linker_script, - ] + outputs = [ _final_linker_script ] } # This config adds a the linker script produced by the preprocess action to # the linker flags. config("${target_name}_config") { - inputs = [ - invoker.linker_script, - ] + inputs = [ invoker.linker_script ] if (!defined(invoker.ldflags)) { ldflags = [] } @@ -118,15 +112,11 @@ template("pw_linker_script") { # The target that adds the linker script config to this library and everything # that depends on it. source_set(target_name) { - inputs = [ - _final_linker_script, - ] + inputs = [ _final_linker_script ] if (defined(invoker.inputs)) { inputs += invoker.inputs } all_dependent_configs = [ ":${target_name}_config" ] - deps = [ - ":${target_name}_preprocess", - ] + deps = [ ":${target_name}_preprocess" ] } } diff --git a/pw_checksum/BUILD.gn b/pw_checksum/BUILD.gn index c45363eea..743ee58d9 100644 --- a/pw_checksum/BUILD.gn +++ b/pw_checksum/BUILD.gn @@ -21,13 +21,9 @@ config("default_config") { source_set("pw_checksum") { public_configs = [ ":default_config" ] - public = [ - "public/pw_checksum/ccitt_crc16.h", - ] + public = [ "public/pw_checksum/ccitt_crc16.h" ] sources = [ "ccitt_crc16.cc" ] + public - public_deps = [ - dir_pw_span, - ] + public_deps = [ dir_pw_span ] } pw_test_group("tests") { @@ -35,9 +31,7 @@ pw_test_group("tests") { } pw_test("ccitt_crc16_test") { - deps = [ - ":pw_checksum", - ] + deps = [ ":pw_checksum" ] sources = [ "ccitt_crc16_test.c", "ccitt_crc16_test.cc", diff --git a/pw_containers/BUILD.gn b/pw_containers/BUILD.gn index eefaa6dc1..7e2aff9be 100644 --- a/pw_containers/BUILD.gn +++ b/pw_containers/BUILD.gn @@ -20,9 +20,7 @@ config("default_config") { source_set("pw_containers") { public_configs = [ ":default_config" ] - public = [ - "public/pw_containers/vector.h", - ] + public = [ "public/pw_containers/vector.h" ] sources = public } @@ -31,10 +29,6 @@ pw_test_group("tests") { } pw_test("vector_test") { - deps = [ - ":pw_containers", - ] - sources = [ - "vector_test.cc", - ] + deps = [ ":pw_containers" ] + sources = [ "vector_test.cc" ] } diff --git a/pw_cpu_exception/BUILD.gn b/pw_cpu_exception/BUILD.gn index 580e65554..bec142e91 100644 --- a/pw_cpu_exception/BUILD.gn +++ b/pw_cpu_exception/BUILD.gn @@ -27,13 +27,9 @@ pw_facade("pw_cpu_exception") { "$dir_pw_span", "$dir_pw_string", ] - public = [ - "public/pw_cpu_exception/cpu_exception.h", - ] + public = [ "public/pw_cpu_exception/cpu_exception.h" ] } pw_doc_group("docs") { - sources = [ - "docs.rst", - ] + sources = [ "docs.rst" ] } diff --git a/pw_cpu_exception_armv7m/BUILD.gn b/pw_cpu_exception_armv7m/BUILD.gn index e7adce75a..d627ab7f0 100644 --- a/pw_cpu_exception_armv7m/BUILD.gn +++ b/pw_cpu_exception_armv7m/BUILD.gn @@ -30,9 +30,7 @@ if (dir_pw_cpu_exception_backend == dir_pw_cpu_exception_armv7m) { "$dir_pw_dumb_io:default_putget_bytes", "$dir_pw_preprocessor", ] - public = [ - "public/pw_cpu_exception_armv7m/cpu_state.h", - ] + public = [ "public/pw_cpu_exception_armv7m/cpu_state.h" ] sources = [ "cpu_exception_entry.cc", "cpu_state.cc", @@ -49,14 +47,10 @@ if (dir_pw_cpu_exception_backend == dir_pw_cpu_exception_armv7m) { ":pw_cpu_exception_armv7m", "$dir_pw_cpu_exception", ] - sources = [ - "exception_entry_test.cc", - ] + sources = [ "exception_entry_test.cc" ] } } pw_doc_group("docs") { - sources = [ - "docs.rst", - ] + sources = [ "docs.rst" ] } diff --git a/pw_docgen/BUILD.gn b/pw_docgen/BUILD.gn index 775c1d72a..c93b7a895 100644 --- a/pw_docgen/BUILD.gn +++ b/pw_docgen/BUILD.gn @@ -15,7 +15,5 @@ import("docs.gni") pw_doc_group("docs") { - sources = [ - "docs.rst", - ] + sources = [ "docs.rst" ] } diff --git a/pw_docgen/docs.gni b/pw_docgen/docs.gni index 34a1a045f..25a5fcc3f 100644 --- a/pw_docgen/docs.gni +++ b/pw_docgen/docs.gni @@ -71,9 +71,7 @@ template("pw_doc_gen") { # Collects all dependency metadata into a single JSON file. _metadata_file_target = "${target_name}_metadata" generated_file(_metadata_file_target) { - outputs = [ - "$target_gen_dir/$target_name.json", - ] + outputs = [ "$target_gen_dir/$target_name.json" ] data_keys = [ "pw_doc_sources", "pw_doc_inputs", @@ -107,12 +105,8 @@ template("pw_doc_gen") { pw_python_script(target_name) { script = "$dir_pw_docgen/py/docgen.py" args = _script_args - deps = [ - ":$_metadata_file_target", - ] - inputs = [ - invoker.conf, - ] + deps = [ ":$_metadata_file_target" ] + inputs = [ invoker.conf ] inputs += invoker.sources stamp = true } diff --git a/pw_doctor/BUILD.gn b/pw_doctor/BUILD.gn index 9eed4a233..57493ab8e 100644 --- a/pw_doctor/BUILD.gn +++ b/pw_doctor/BUILD.gn @@ -15,7 +15,5 @@ import("$dir_pw_docgen/docs.gni") pw_doc_group("docs") { - sources = [ - "docs.rst", - ] + sources = [ "docs.rst" ] } diff --git a/pw_dumb_io/BUILD.gn b/pw_dumb_io/BUILD.gn index 47d2d06b9..b451afa04 100644 --- a/pw_dumb_io/BUILD.gn +++ b/pw_dumb_io/BUILD.gn @@ -26,22 +26,14 @@ pw_facade("pw_dumb_io") { "$dir_pw_span", "$dir_pw_status", ] - public = [ - "public/pw_dumb_io/dumb_io.h", - ] + public = [ "public/pw_dumb_io/dumb_io.h" ] } source_set("default_putget_bytes") { - deps = [ - ":facade", - ] - sources = [ - "dumb_io.cc", - ] + deps = [ ":facade" ] + sources = [ "dumb_io.cc" ] } pw_doc_group("docs") { - sources = [ - "docs.rst", - ] + sources = [ "docs.rst" ] } diff --git a/pw_dumb_io_baremetal_stm32f429/BUILD.gn b/pw_dumb_io_baremetal_stm32f429/BUILD.gn index 1a3a04ada..bdd2aedec 100644 --- a/pw_dumb_io_baremetal_stm32f429/BUILD.gn +++ b/pw_dumb_io_baremetal_stm32f429/BUILD.gn @@ -18,22 +18,16 @@ import("$dir_pw_docgen/docs.gni") # compatible with this backend. if (dir_pw_dumb_io_backend == dir_pw_dumb_io_baremetal_stm32f429) { source_set("pw_dumb_io_baremetal_stm32f429") { - public_deps = [ - "$dir_pw_boot_armv7m", - ] + public_deps = [ "$dir_pw_boot_armv7m" ] deps = [ "$dir_pw_dumb_io:default_putget_bytes", "$dir_pw_dumb_io:facade", "$dir_pw_preprocessor", ] - sources = [ - "dumb_io_baremetal.cc", - ] + sources = [ "dumb_io_baremetal.cc" ] } } pw_doc_group("docs") { - sources = [ - "docs.rst", - ] + sources = [ "docs.rst" ] } diff --git a/pw_dumb_io_stdio/BUILD.gn b/pw_dumb_io_stdio/BUILD.gn index 0cd7ca3ba..82e4c78c3 100644 --- a/pw_dumb_io_stdio/BUILD.gn +++ b/pw_dumb_io_stdio/BUILD.gn @@ -22,14 +22,10 @@ if (dir_pw_dumb_io_backend == dir_pw_dumb_io_stdio) { "$dir_pw_dumb_io:default_putget_bytes", "$dir_pw_dumb_io:facade", ] - sources = [ - "dumb_io.cc", - ] + sources = [ "dumb_io.cc" ] } } pw_doc_group("docs") { - sources = [ - "docs.rst", - ] + sources = [ "docs.rst" ] } diff --git a/pw_env_setup/py/pw_env_setup/cipd_setup/pigweed.json b/pw_env_setup/py/pw_env_setup/cipd_setup/pigweed.json index 4bf633929..d7df4c876 100644 --- a/pw_env_setup/py/pw_env_setup/cipd_setup/pigweed.json +++ b/pw_env_setup/py/pw_env_setup/cipd_setup/pigweed.json @@ -2,7 +2,7 @@ { "path": "gn/gn/${platform}", "tags": [ - "git_revision:6e5ba2e7210823cf7ccce3eb2a23336a4e7f1349" + "git_revision:239533d2d91a04b3317ca9101cf7189f4e651e4d" ] }, { diff --git a/pw_kvs/BUILD.gn b/pw_kvs/BUILD.gn index 3256401da..10c83d692 100644 --- a/pw_kvs/BUILD.gn +++ b/pw_kvs/BUILD.gn @@ -61,9 +61,7 @@ source_set("pw_kvs") { } source_set("crc16") { - public = [ - "public/pw_kvs/crc16_checksum.h", - ] + public = [ "public/pw_kvs/crc16_checksum.h" ] sources = public public_deps = [ ":pw_kvs", @@ -86,9 +84,7 @@ source_set("test_utils") { } executable("debug_cli") { - sources = [ - "debug_cli.cc", - ] + sources = [ "debug_cli.cc" ] deps = [ ":crc16", ":pw_kvs", @@ -109,12 +105,8 @@ pw_test_group("tests") { } pw_test("alignment_test") { - deps = [ - ":pw_kvs", - ] - sources = [ - "alignment_test.cc", - ] + deps = [ ":pw_kvs" ] + sources = [ "alignment_test.cc" ] } pw_test("checksum_test") { @@ -123,9 +115,7 @@ pw_test("checksum_test") { ":pw_kvs", dir_pw_log, ] - sources = [ - "checksum_test.cc", - ] + sources = [ "checksum_test.cc" ] } pw_test("entry_test") { @@ -134,9 +124,7 @@ pw_test("entry_test") { ":pw_kvs", ":test_utils", ] - sources = [ - "entry_test.cc", - ] + sources = [ "entry_test.cc" ] } pw_test("key_value_store_test") { @@ -147,9 +135,7 @@ pw_test("key_value_store_test") { dir_pw_checksum, dir_pw_log, ] - sources = [ - "key_value_store_test.cc", - ] + sources = [ "key_value_store_test.cc" ] } pw_test("key_value_store_error_handling_test") { @@ -159,9 +145,7 @@ pw_test("key_value_store_error_handling_test") { ":test_utils", dir_pw_log, ] - sources = [ - "key_value_store_error_handling_test.cc", - ] + sources = [ "key_value_store_error_handling_test.cc" ] } pw_test("key_value_store_fuzz_test") { @@ -170,9 +154,7 @@ pw_test("key_value_store_fuzz_test") { ":pw_kvs", ":test_utils", ] - sources = [ - "key_value_store_fuzz_test.cc", - ] + sources = [ "key_value_store_fuzz_test.cc" ] } pw_test("key_value_store_map_test") { @@ -182,13 +164,9 @@ pw_test("key_value_store_map_test") { ":test_utils", dir_pw_checksum, ] - sources = [ - "key_value_store_map_test.cc", - ] + sources = [ "key_value_store_map_test.cc" ] } pw_doc_group("docs") { - sources = [ - "docs.rst", - ] + sources = [ "docs.rst" ] } diff --git a/pw_log/BUILD.gn b/pw_log/BUILD.gn index e2cea75ed..9216bf4b6 100644 --- a/pw_log/BUILD.gn +++ b/pw_log/BUILD.gn @@ -27,9 +27,7 @@ pw_facade("pw_log") { "public/pw_log/levels.h", "public/pw_log/log.h", ] - public_deps = [ - dir_pw_preprocessor, - ] + public_deps = [ dir_pw_preprocessor ] } pw_test_group("tests") { @@ -54,7 +52,5 @@ if (dir_pw_log_backend != "") { } pw_doc_group("docs") { - sources = [ - "docs.rst", - ] + sources = [ "docs.rst" ] } diff --git a/pw_log_basic/BUILD.gn b/pw_log_basic/BUILD.gn index 97979e2e4..2b895ace6 100644 --- a/pw_log_basic/BUILD.gn +++ b/pw_log_basic/BUILD.gn @@ -26,12 +26,8 @@ if (dir_pw_log_backend == dir_pw_log_basic) { ":backend_config", ":default_config", ] - deps = [ - ":pw_log_basic_core", - ] - public = [ - "public_overrides/pw_log_backend/log_backend.h", - ] + deps = [ ":pw_log_basic_core" ] + public = [ "public_overrides/pw_log_backend/log_backend.h" ] sources = public } } @@ -44,8 +40,6 @@ source_set("pw_log_basic_core") { "$dir_pw_preprocessor", "$dir_pw_string", ] - public = [ - "public/pw_log_basic/log_basic.h", - ] + public = [ "public/pw_log_basic/log_basic.h" ] sources = public + [ "log_basic.cc" ] } diff --git a/pw_minimal_cpp_stdlib/BUILD.gn b/pw_minimal_cpp_stdlib/BUILD.gn index 533dbbd1b..97060a54f 100644 --- a/pw_minimal_cpp_stdlib/BUILD.gn +++ b/pw_minimal_cpp_stdlib/BUILD.gn @@ -73,22 +73,14 @@ pw_test_group("tests") { pw_test("minimal_cpp_stdlib_test") { configs = [ ":no_cpp_includes" ] - deps = [ - ":pw_minimal_cpp_stdlib", - ] - sources = [ - "test.cc", - ] + deps = [ ":pw_minimal_cpp_stdlib" ] + sources = [ "test.cc" ] } pw_test("standard_library_test") { - sources = [ - "test.cc", - ] + sources = [ "test.cc" ] } pw_doc_group("docs") { - sources = [ - "docs.rst", - ] + sources = [ "docs.rst" ] } diff --git a/pw_module/BUILD.gn b/pw_module/BUILD.gn index 9eed4a233..57493ab8e 100644 --- a/pw_module/BUILD.gn +++ b/pw_module/BUILD.gn @@ -15,7 +15,5 @@ import("$dir_pw_docgen/docs.gni") pw_doc_group("docs") { - sources = [ - "docs.rst", - ] + sources = [ "docs.rst" ] } diff --git a/pw_polyfill/BUILD.gn b/pw_polyfill/BUILD.gn index c2d00d3d3..c4e485e31 100644 --- a/pw_polyfill/BUILD.gn +++ b/pw_polyfill/BUILD.gn @@ -21,9 +21,7 @@ config("public") { source_set("pw_polyfill") { public_configs = [ ":public" ] - public_deps = [ - ":standard_library", - ] + public_deps = [ ":standard_library" ] public = [ "public/pw_polyfill/language_features.h", "public/pw_polyfill/standard.h", @@ -37,9 +35,7 @@ config("overrides_config") { source_set("overrides") { public_configs = [ ":overrides_config" ] - public_deps = [ - ":standard_library", - ] + public_deps = [ ":standard_library" ] inputs = [ "public_overrides/assert.h", "public_overrides/cstddef", @@ -76,36 +72,22 @@ pw_test_group("tests") { } pw_test("default_cpp_test") { - deps = [ - ":pw_polyfill", - ] - sources = [ - "test.cc", - ] + deps = [ ":pw_polyfill" ] + sources = [ "test.cc" ] } pw_test("cpp11_test") { configs = [ "$dir_pw_build:cpp11" ] - sources = [ - "test.cc", - ] - deps = [ - ":pw_polyfill", - ] + sources = [ "test.cc" ] + deps = [ ":pw_polyfill" ] } pw_test("cpp14_test") { configs = [ "$dir_pw_build:cpp14" ] - sources = [ - "test.cc", - ] - deps = [ - ":pw_polyfill", - ] + sources = [ "test.cc" ] + deps = [ ":pw_polyfill" ] } pw_doc_group("docs") { - sources = [ - "docs.rst", - ] + sources = [ "docs.rst" ] } diff --git a/pw_preprocessor/BUILD.gn b/pw_preprocessor/BUILD.gn index 3ef1b5b8a..a8139853b 100644 --- a/pw_preprocessor/BUILD.gn +++ b/pw_preprocessor/BUILD.gn @@ -32,9 +32,7 @@ source_set("pw_preprocessor") { } pw_doc_group("docs") { - sources = [ - "docs.rst", - ] + sources = [ "docs.rst" ] } # All pw_preprocessor test binaries. @@ -50,12 +48,8 @@ pw_test_group("tests") { template("preprocessor_test") { not_needed([ "invoker" ]) pw_test(target_name) { - deps = [ - ":pw_preprocessor", - ] - sources = [ - "$target_name.cc", - ] + deps = [ ":pw_preprocessor" ] + sources = [ "$target_name.cc" ] } } diff --git a/pw_presubmit/BUILD.gn b/pw_presubmit/BUILD.gn index 9eed4a233..57493ab8e 100644 --- a/pw_presubmit/BUILD.gn +++ b/pw_presubmit/BUILD.gn @@ -15,7 +15,5 @@ import("$dir_pw_docgen/docs.gni") pw_doc_group("docs") { - sources = [ - "docs.rst", - ] + sources = [ "docs.rst" ] } diff --git a/pw_protobuf/BUILD.gn b/pw_protobuf/BUILD.gn index ea82ecc14..6550ea428 100644 --- a/pw_protobuf/BUILD.gn +++ b/pw_protobuf/BUILD.gn @@ -70,21 +70,13 @@ pw_test_group("tests") { } pw_test("decoder_test") { - deps = [ - ":pw_protobuf", - ] - sources = [ - "decoder_test.cc", - ] + deps = [ ":pw_protobuf" ] + sources = [ "decoder_test.cc" ] } pw_test("encoder_test") { - deps = [ - ":pw_protobuf", - ] - sources = [ - "encoder_test.cc", - ] + deps = [ ":pw_protobuf" ] + sources = [ "encoder_test.cc" ] } pw_test("codegen_test") { @@ -92,9 +84,7 @@ pw_test("codegen_test") { ":codegen_test_protos_cc", ":pw_protobuf", ] - sources = [ - "codegen_test.cc", - ] + sources = [ "codegen_test.cc" ] } pw_proto_library("codegen_test_protos") { diff --git a/pw_protobuf/size_report/BUILD.gn b/pw_protobuf/size_report/BUILD.gn index d6621ae76..4df99f6d5 100644 --- a/pw_protobuf/size_report/BUILD.gn +++ b/pw_protobuf/size_report/BUILD.gn @@ -20,9 +20,7 @@ _decoder_full = { "$dir_pw_preprocessor", "$dir_pw_protobuf:pw_protobuf", ] - sources = [ - "decoder_full.cc", - ] + sources = [ "decoder_full.cc" ] } pw_toolchain_size_report("decoder_full") { @@ -39,9 +37,7 @@ pw_toolchain_size_report("decoder_incremental") { "$dir_pw_preprocessor", "$dir_pw_protobuf:pw_protobuf", ] - sources = [ - "decoder_incremental.cc", - ] + sources = [ "decoder_incremental.cc" ] } title = "Adding more fields to decode callback" } diff --git a/pw_protobuf_compiler/BUILD.gn b/pw_protobuf_compiler/BUILD.gn index 9eed4a233..57493ab8e 100644 --- a/pw_protobuf_compiler/BUILD.gn +++ b/pw_protobuf_compiler/BUILD.gn @@ -15,7 +15,5 @@ import("$dir_pw_docgen/docs.gni") pw_doc_group("docs") { - sources = [ - "docs.rst", - ] + sources = [ "docs.rst" ] } diff --git a/pw_span/BUILD.gn b/pw_span/BUILD.gn index 60c104e4a..2baabbd52 100644 --- a/pw_span/BUILD.gn +++ b/pw_span/BUILD.gn @@ -21,12 +21,8 @@ config("default_config") { source_set("pw_span") { public_configs = [ ":default_config" ] - public_deps = [ - "$dir_pw_polyfill", - ] - public = [ - "public/pw_span/span.h", - ] + public_deps = [ "$dir_pw_polyfill" ] + public = [ "public/pw_span/span.h" ] sources = public } @@ -35,16 +31,10 @@ pw_test_group("tests") { } pw_test("test") { - deps = [ - ":pw_span", - ] - sources = [ - "span_test.cc", - ] + deps = [ ":pw_span" ] + sources = [ "span_test.cc" ] } pw_doc_group("docs") { - sources = [ - "docs.rst", - ] + sources = [ "docs.rst" ] } diff --git a/pw_status/BUILD.gn b/pw_status/BUILD.gn index 5231111ed..2763068f6 100644 --- a/pw_status/BUILD.gn +++ b/pw_status/BUILD.gn @@ -36,9 +36,7 @@ pw_test_group("tests") { } pw_test("status_test") { - deps = [ - ":pw_status", - ] + deps = [ ":pw_status" ] sources = [ "status_test.c", "status_test.cc", @@ -46,16 +44,10 @@ pw_test("status_test") { } pw_test("status_with_size_test") { - deps = [ - ":pw_status", - ] - sources = [ - "status_with_size_test.cc", - ] + deps = [ ":pw_status" ] + sources = [ "status_with_size_test.cc" ] } pw_doc_group("docs") { - sources = [ - "docs.rst", - ] + sources = [ "docs.rst" ] } diff --git a/pw_string/BUILD.gn b/pw_string/BUILD.gn index 01bf37f60..69513da76 100644 --- a/pw_string/BUILD.gn +++ b/pw_string/BUILD.gn @@ -58,54 +58,32 @@ pw_test_group("tests") { } pw_test("format_test") { - deps = [ - ":pw_string", - ] - sources = [ - "format_test.cc", - ] + deps = [ ":pw_string" ] + sources = [ "format_test.cc" ] } pw_test("string_builder_test") { - deps = [ - ":pw_string", - ] - sources = [ - "string_builder_test.cc", - ] + deps = [ ":pw_string" ] + sources = [ "string_builder_test.cc" ] } pw_test("to_string_test") { - deps = [ - ":pw_string", - ] - sources = [ - "to_string_test.cc", - ] + deps = [ ":pw_string" ] + sources = [ "to_string_test.cc" ] } pw_test("type_to_string_test") { - deps = [ - ":pw_string", - ] - sources = [ - "type_to_string_test.cc", - ] + deps = [ ":pw_string" ] + sources = [ "type_to_string_test.cc" ] } pw_test("util_test") { - deps = [ - ":pw_string", - ] - sources = [ - "util_test.cc", - ] + deps = [ ":pw_string" ] + sources = [ "util_test.cc" ] } pw_doc_group("docs") { - sources = [ - "docs.rst", - ] + sources = [ "docs.rst" ] report_deps = [ ":format_size_report", ":string_builder_size_report", diff --git a/pw_string/size_report/BUILD.gn b/pw_string/size_report/BUILD.gn index 6c16b3daf..cb11f7648 100644 --- a/pw_string/size_report/BUILD.gn +++ b/pw_string/size_report/BUILD.gn @@ -15,9 +15,7 @@ import("$dir_pw_build/pw_executable.gni") pw_executable("single_write_snprintf") { - sources = [ - "format_single.cc", - ] + sources = [ "format_single.cc" ] deps = [ "$dir_pw_bloat:bloat_this_binary", "..", @@ -26,9 +24,7 @@ pw_executable("single_write_snprintf") { } pw_executable("single_write_format") { - sources = [ - "format_single.cc", - ] + sources = [ "format_single.cc" ] deps = [ "$dir_pw_bloat:bloat_this_binary", "..", @@ -37,9 +33,7 @@ pw_executable("single_write_format") { } pw_executable("multiple_writes_snprintf") { - sources = [ - "format_multiple.cc", - ] + sources = [ "format_multiple.cc" ] deps = [ "$dir_pw_bloat:bloat_this_binary", "..", @@ -48,9 +42,7 @@ pw_executable("multiple_writes_snprintf") { } pw_executable("multiple_writes_format") { - sources = [ - "format_multiple.cc", - ] + sources = [ "format_multiple.cc" ] deps = [ "$dir_pw_bloat:bloat_this_binary", "..", @@ -59,9 +51,7 @@ pw_executable("multiple_writes_format") { } pw_executable("many_writes_snprintf") { - sources = [ - "format_many_without_error_handling.cc", - ] + sources = [ "format_many_without_error_handling.cc" ] deps = [ "$dir_pw_bloat:bloat_this_binary", "..", @@ -70,9 +60,7 @@ pw_executable("many_writes_snprintf") { } pw_executable("many_writes_format") { - sources = [ - "format_many_without_error_handling.cc", - ] + sources = [ "format_many_without_error_handling.cc" ] deps = [ "$dir_pw_bloat:bloat_this_binary", "..", @@ -81,9 +69,7 @@ pw_executable("many_writes_format") { } pw_executable("build_string_with_snprintf_no_base_snprintf") { - sources = [ - "string_builder_size_report.cc", - ] + sources = [ "string_builder_size_report.cc" ] deps = [ "$dir_pw_bloat:bloat_this_binary", "..", @@ -95,9 +81,7 @@ pw_executable("build_string_with_snprintf_no_base_snprintf") { } pw_executable("build_string_with_string_builder_no_base_snprintf") { - sources = [ - "string_builder_size_report.cc", - ] + sources = [ "string_builder_size_report.cc" ] deps = [ "$dir_pw_bloat:bloat_this_binary", "..", @@ -109,9 +93,7 @@ pw_executable("build_string_with_string_builder_no_base_snprintf") { } pw_executable("build_string_with_snprintf") { - sources = [ - "string_builder_size_report.cc", - ] + sources = [ "string_builder_size_report.cc" ] deps = [ "$dir_pw_bloat:bloat_this_binary", "..", @@ -123,9 +105,7 @@ pw_executable("build_string_with_snprintf") { } pw_executable("build_string_with_string_builder") { - sources = [ - "string_builder_size_report.cc", - ] + sources = [ "string_builder_size_report.cc" ] deps = [ "$dir_pw_bloat:bloat_this_binary", "..", @@ -137,9 +117,7 @@ pw_executable("build_string_with_string_builder") { } pw_executable("build_string_incremental_with_snprintf") { - sources = [ - "string_builder_size_report_incremental.cc", - ] + sources = [ "string_builder_size_report_incremental.cc" ] deps = [ "$dir_pw_bloat:bloat_this_binary", "..", @@ -148,9 +126,7 @@ pw_executable("build_string_incremental_with_snprintf") { } pw_executable("build_string_incremental_with_string_builder") { - sources = [ - "string_builder_size_report_incremental.cc", - ] + sources = [ "string_builder_size_report_incremental.cc" ] deps = [ "$dir_pw_bloat:bloat_this_binary", "..", diff --git a/pw_target_runner/BUILD.gn b/pw_target_runner/BUILD.gn index 3d631bf9b..b48c14683 100644 --- a/pw_target_runner/BUILD.gn +++ b/pw_target_runner/BUILD.gn @@ -16,20 +16,14 @@ import("$dir_pw_docgen/docs.gni") import("$dir_pw_protobuf_compiler/proto.gni") pw_doc_group("docs") { - sources = [ - "docs.rst", - ] + sources = [ "docs.rst" ] group_deps = [ "go:docs" ] } pw_proto_library("target_runner_proto") { - sources = [ - "pw_target_runner_protos/target_runner.proto", - ] + sources = [ "pw_target_runner_protos/target_runner.proto" ] } pw_proto_library("exec_server_config_proto") { - sources = [ - "pw_target_runner_protos/exec_server_config.proto", - ] + sources = [ "pw_target_runner_protos/exec_server_config.proto" ] } diff --git a/pw_target_runner/go/BUILD.gn b/pw_target_runner/go/BUILD.gn index 4dad302e8..65a280281 100644 --- a/pw_target_runner/go/BUILD.gn +++ b/pw_target_runner/go/BUILD.gn @@ -17,33 +17,23 @@ import("$dir_pw_build/host_tool.gni") import("$dir_pw_docgen/docs.gni") pw_doc_group("docs") { - sources = [ - "docs.rst", - ] + sources = [ "docs.rst" ] } pw_go_executable("pw_target_runner_client") { - deps = [ - "src/pigweed.dev/pw_target_runner_client", - ] + deps = [ "src/pigweed.dev/pw_target_runner_client" ] package = "pigweed.dev/pw_target_runner_client" } pw_go_executable("pw_target_runner_server") { - deps = [ - "src/pigweed.dev/pw_target_runner_server", - ] + deps = [ "src/pigweed.dev/pw_target_runner_server" ] package = "pigweed.dev/pw_target_runner_server" } pw_host_tool("simple_client") { - deps = [ - ":pw_target_runner_client", - ] + deps = [ ":pw_target_runner_client" ] } pw_host_tool("simple_server") { - deps = [ - ":pw_target_runner_server", - ] + deps = [ ":pw_target_runner_server" ] } diff --git a/pw_target_runner/go/src/pigweed.dev/pw_target_runner/BUILD.gn b/pw_target_runner/go/src/pigweed.dev/pw_target_runner/BUILD.gn index ab6a0aa8c..5395a9ed5 100644 --- a/pw_target_runner/go/src/pigweed.dev/pw_target_runner/BUILD.gn +++ b/pw_target_runner/go/src/pigweed.dev/pw_target_runner/BUILD.gn @@ -20,9 +20,7 @@ pw_go_package("pw_target_runner") { "server.go", "worker_pool.go", ] - deps = [ - "$dir_pw_target_runner:target_runner_proto_go", - ] + deps = [ "$dir_pw_target_runner:target_runner_proto_go" ] external_deps = [ "google.golang.org/grpc" ] gopath = "$dir_pw_target_runner/go" } diff --git a/pw_target_runner/go/src/pigweed.dev/pw_target_runner_client/BUILD.gn b/pw_target_runner/go/src/pigweed.dev/pw_target_runner_client/BUILD.gn index 96e51f3e4..4ed3a5df5 100644 --- a/pw_target_runner/go/src/pigweed.dev/pw_target_runner_client/BUILD.gn +++ b/pw_target_runner/go/src/pigweed.dev/pw_target_runner_client/BUILD.gn @@ -15,11 +15,7 @@ import("$dir_pw_build/go.gni") pw_go_package("pw_target_runner_client") { - sources = [ - "main.go", - ] - deps = [ - "$dir_pw_target_runner:target_runner_proto_go", - ] + sources = [ "main.go" ] + deps = [ "$dir_pw_target_runner:target_runner_proto_go" ] gopath = "$dir_pw_target_runner/go" } diff --git a/pw_target_runner/go/src/pigweed.dev/pw_target_runner_server/BUILD.gn b/pw_target_runner/go/src/pigweed.dev/pw_target_runner_server/BUILD.gn index eda11cbb9..c6462696f 100644 --- a/pw_target_runner/go/src/pigweed.dev/pw_target_runner_server/BUILD.gn +++ b/pw_target_runner/go/src/pigweed.dev/pw_target_runner_server/BUILD.gn @@ -15,9 +15,7 @@ import("$dir_pw_build/go.gni") pw_go_package("pw_target_runner_server") { - sources = [ - "main.go", - ] + sources = [ "main.go" ] deps = [ "$dir_pw_target_runner:exec_server_config_proto_go", "$dir_pw_target_runner/go/src/pigweed.dev/pw_target_runner", diff --git a/pw_tokenizer/BUILD.gn b/pw_tokenizer/BUILD.gn index f628380ce..de5223d05 100644 --- a/pw_tokenizer/BUILD.gn +++ b/pw_tokenizer/BUILD.gn @@ -25,9 +25,7 @@ source_set("pw_tokenizer") { "$dir_pw_preprocessor", "$dir_pw_span", ] - deps = [ - "$dir_pw_varint", - ] + deps = [ "$dir_pw_varint" ] public = [ "public/pw_tokenizer/pw_tokenizer_65599_fixed_length_hash.h", "public/pw_tokenizer/tokenize.h", @@ -52,27 +50,19 @@ source_set("pw_tokenizer") { source_set("base64") { public_configs = [ ":default_config" ] - public = [ - "public/pw_tokenizer/base64.h", - ] + public = [ "public/pw_tokenizer/base64.h" ] sources = [ "base64.cc" ] + public public_deps = [ "$dir_pw_preprocessor", "$dir_pw_span", ] - deps = [ - "$dir_pw_base64", - ] + deps = [ "$dir_pw_base64" ] } source_set("decoder") { public_configs = [ ":default_config" ] - public_deps = [ - "$dir_pw_span", - ] - deps = [ - "$dir_pw_varint", - ] + public_deps = [ "$dir_pw_span" ] + deps = [ "$dir_pw_varint" ] public = [ "public/pw_tokenizer/detokenize.h", "public/pw_tokenizer/token_database.h", @@ -98,9 +88,7 @@ executable("generate_decoding_test_data") { ":pw_tokenizer", "$dir_pw_varint", ] - sources = [ - "generate_decoding_test_data.cc", - ] + sources = [ "generate_decoding_test_data.cc" ] } # Executable for generating a test ELF file for elf_reader_test.py. A host @@ -110,9 +98,7 @@ executable("elf_reader_test_binary") { ":pw_tokenizer", "$dir_pw_varint", ] - sources = [ - "py/elf_reader_test_binary.c", - ] + sources = [ "py/elf_reader_test_binary.c" ] ldflags = [ "-Wl,--unresolved-symbols=ignore-all" ] # main is not defined } @@ -142,18 +128,12 @@ pw_test("argument_types_test") { "argument_types_test.cc", "pw_tokenizer_private/argument_types_test.h", ] - deps = [ - ":pw_tokenizer", - ] + deps = [ ":pw_tokenizer" ] } pw_test("base64_test") { - sources = [ - "base64_test.cc", - ] - deps = [ - ":base64", - ] + sources = [ "base64_test.cc" ] + deps = [ ":base64" ] } pw_test("decode_test") { @@ -169,12 +149,8 @@ pw_test("decode_test") { } pw_test("detokenize_test") { - sources = [ - "detokenize_test.cc", - ] - deps = [ - ":decoder", - ] + sources = [ "detokenize_test.cc" ] + deps = [ ":decoder" ] } pw_test("hash_test") { @@ -182,16 +158,14 @@ pw_test("hash_test") { "hash_test.cc", "pw_tokenizer_private/generated_hash_test_cases.h", ] - deps = [ - ":pw_tokenizer", - ] + deps = [ ":pw_tokenizer" ] } # Fully test C++11 and C++14 compatibility by compiling all sources as C++11 or # C++14. _simple_tokenize_test_sources = [ - "public/pw_tokenizer/pw_tokenizer_65599_fixed_length_hash.h", - "public/pw_tokenizer/tokenize.h", + "$dir_pw_varint/public/pw_varint/varint.h", + "$dir_pw_varint/varint.cc", "public/pw_tokenizer/config.h", "public/pw_tokenizer/internal/argument_types.h", "public/pw_tokenizer/internal/argument_types_macro_4_byte.h", @@ -200,10 +174,10 @@ _simple_tokenize_test_sources = [ "public/pw_tokenizer/internal/pw_tokenizer_65599_fixed_length_80_hash_macro.h", "public/pw_tokenizer/internal/pw_tokenizer_65599_fixed_length_96_hash_macro.h", "public/pw_tokenizer/internal/tokenize_string.h", - "tokenize.cc", + "public/pw_tokenizer/pw_tokenizer_65599_fixed_length_hash.h", + "public/pw_tokenizer/tokenize.h", "simple_tokenize_test.cc", - "$dir_pw_varint/public/pw_varint/varint.h", - "$dir_pw_varint/varint.cc", + "tokenize.cc", ] _simple_tokenize_test_configs = [ ":default_config", @@ -213,34 +187,24 @@ _simple_tokenize_test_configs = [ pw_test("simple_tokenize_test_cpp11") { configs = [ "$dir_pw_build:cpp11" ] + _simple_tokenize_test_configs sources = _simple_tokenize_test_sources - deps = [ - dir_pw_preprocessor, - ] + deps = [ dir_pw_preprocessor ] } pw_test("simple_tokenize_test_cpp14") { configs = [ "$dir_pw_build:cpp14" ] + _simple_tokenize_test_configs sources = _simple_tokenize_test_sources - deps = [ - dir_pw_preprocessor, - ] + deps = [ dir_pw_preprocessor ] } pw_test("simple_tokenize_test_cpp17") { configs = [ "$dir_pw_build:cpp17" ] + _simple_tokenize_test_configs sources = _simple_tokenize_test_sources - deps = [ - dir_pw_preprocessor, - ] + deps = [ dir_pw_preprocessor ] } pw_test("token_database_test") { - sources = [ - "token_database_test.cc", - ] - deps = [ - ":decoder", - ] + sources = [ "token_database_test.cc" ] + deps = [ ":decoder" ] } pw_test("tokenize_test") { @@ -276,9 +240,7 @@ declare_args() { shared_library("detokenizer_jni") { public_configs = [ ":default_config" ] include_dirs = pw_java_native_interface_include_dirs - sources = [ - "java/dev/pigweed/tokenizer/detokenizer.cc", - ] + sources = [ "java/dev/pigweed/tokenizer/detokenizer.cc" ] public_deps = [ ":decoder", "$dir_pw_preprocessor", @@ -286,7 +248,5 @@ shared_library("detokenizer_jni") { } pw_doc_group("docs") { - sources = [ - "docs.rst", - ] + sources = [ "docs.rst" ] } diff --git a/pw_toolchain/arm_gcc.gni b/pw_toolchain/arm_gcc.gni index 51bab63c4..8c3dad33d 100644 --- a/pw_toolchain/arm_gcc.gni +++ b/pw_toolchain/arm_gcc.gni @@ -101,9 +101,8 @@ template("arm_gcc_toolchain") { ]) depsformat = "gcc" description = "cc {{output}}" - outputs = [ - "{{source_out_dir}}/{{target_output_name}}.{{source_file_part}}.o", - ] + outputs = + [ "{{source_out_dir}}/{{target_output_name}}.{{source_file_part}}.o" ] } tool("cxx") { @@ -123,17 +122,15 @@ template("arm_gcc_toolchain") { ]) depsformat = "gcc" description = "c++ {{output}}" - outputs = [ - "{{source_out_dir}}/{{target_output_name}}.{{source_file_part}}.o", - ] + outputs = + [ "{{source_out_dir}}/{{target_output_name}}.{{source_file_part}}.o" ] } tool("alink") { command = "rm -f {{output}} && $_ar rcs {{output}} {{inputs}}" description = "ar {{target_output_name}}{{output_extension}}" - outputs = [ - "{{target_out_dir}}/{{target_output_name}}{{output_extension}}", - ] + outputs = + [ "{{target_out_dir}}/{{target_output_name}}{{output_extension}}" ] default_output_extension = ".a" } @@ -177,9 +174,7 @@ template("arm_gcc_toolchain") { tool("link") { command = _link_command description = "ld $_link_outfile" - outputs = [ - _link_outfile, - ] + outputs = [ _link_outfile ] default_output_dir = "{{target_out_dir}}" default_output_extension = ".elf" } @@ -187,9 +182,7 @@ template("arm_gcc_toolchain") { tool("solink") { command = _link_command + " -shared" description = "ld -shared $_link_outfile" - outputs = [ - _link_outfile, - ] + outputs = [ _link_outfile ] default_output_dir = "{{target_out_dir}}" default_output_extension = ".so" } diff --git a/pw_toolchain/host_clang.gni b/pw_toolchain/host_clang.gni index 491e3bc86..ef417f8fa 100644 --- a/pw_toolchain/host_clang.gni +++ b/pw_toolchain/host_clang.gni @@ -95,9 +95,8 @@ template("host_clang") { ]) depsformat = "gcc" description = "cc {{output}}" - outputs = [ - "{{source_out_dir}}/{{target_output_name}}.{{source_file_part}}.o", - ] + outputs = + [ "{{source_out_dir}}/{{target_output_name}}.{{source_file_part}}.o" ] } tool("cxx") { @@ -117,17 +116,15 @@ template("host_clang") { ]) depsformat = "gcc" description = "c++ {{output}}" - outputs = [ - "{{source_out_dir}}/{{target_output_name}}.{{source_file_part}}.o", - ] + outputs = + [ "{{source_out_dir}}/{{target_output_name}}.{{source_file_part}}.o" ] } tool("alink") { command = "rm -f {{output}} && $_ar rcs {{output}} {{inputs}}" description = "ar {{target_output_name}}{{output_extension}}" - outputs = [ - "{{target_out_dir}}/{{target_output_name}}{{output_extension}}", - ] + outputs = + [ "{{target_out_dir}}/{{target_output_name}}{{output_extension}}" ] default_output_extension = ".a" } @@ -174,9 +171,7 @@ template("host_clang") { tool("link") { command = _link_command description = "ld $_link_outfile" - outputs = [ - _link_outfile, - ] + outputs = [ _link_outfile ] default_output_dir = "{{target_out_dir}}" default_output_extension = "" } @@ -184,9 +179,7 @@ template("host_clang") { tool("solink") { command = _link_command + " -shared" description = "ld -shared $_link_outfile" - outputs = [ - _link_outfile, - ] + outputs = [ _link_outfile ] default_output_dir = "{{target_out_dir}}" default_output_extension = ".so" } diff --git a/pw_toolchain/host_gcc.gni b/pw_toolchain/host_gcc.gni index 1d221ed9a..d34386a1d 100644 --- a/pw_toolchain/host_gcc.gni +++ b/pw_toolchain/host_gcc.gni @@ -98,9 +98,8 @@ template("host_gcc") { ]) depsformat = "gcc" description = "cc {{output}}" - outputs = [ - "{{source_out_dir}}/{{target_output_name}}.{{source_file_part}}.o", - ] + outputs = + [ "{{source_out_dir}}/{{target_output_name}}.{{source_file_part}}.o" ] } tool("cxx") { @@ -120,17 +119,15 @@ template("host_gcc") { ]) depsformat = "gcc" description = "c++ {{output}}" - outputs = [ - "{{source_out_dir}}/{{target_output_name}}.{{source_file_part}}.o", - ] + outputs = + [ "{{source_out_dir}}/{{target_output_name}}.{{source_file_part}}.o" ] } tool("alink") { command = "rm -f {{output}} && $_ar rcs {{output}} {{inputs}}" description = "ar {{target_output_name}}{{output_extension}}" - outputs = [ - "{{target_out_dir}}/{{target_output_name}}{{output_extension}}", - ] + outputs = + [ "{{target_out_dir}}/{{target_output_name}}{{output_extension}}" ] default_output_extension = ".a" } @@ -177,9 +174,7 @@ template("host_gcc") { tool("link") { command = _link_command description = "ld $_link_outfile" - outputs = [ - _link_outfile, - ] + outputs = [ _link_outfile ] default_output_dir = "{{target_out_dir}}" default_output_extension = "" } @@ -187,9 +182,7 @@ template("host_gcc") { tool("solink") { command = _link_command + " -shared" description = "ld -shared $_link_outfile" - outputs = [ - _link_outfile, - ] + outputs = [ _link_outfile ] default_output_dir = "{{target_out_dir}}" default_output_extension = ".so" } diff --git a/pw_unit_test/BUILD.gn b/pw_unit_test/BUILD.gn index e4eb1d05c..0906df2f2 100644 --- a/pw_unit_test/BUILD.gn +++ b/pw_unit_test/BUILD.gn @@ -44,9 +44,7 @@ source_set("simple_printing_event_handler") { ":pw_unit_test", "$dir_pw_preprocessor", ] - public = [ - "public/pw_unit_test/simple_printing_event_handler.h", - ] + public = [ "public/pw_unit_test/simple_printing_event_handler.h" ] sources = [ "simple_printing_event_handler.cc" ] + public } @@ -54,16 +52,12 @@ source_set("simple_printing_event_handler") { # framework. Unit test files can link against this library to build runnable # unit test executables. source_set("simple_printing_main") { - public_deps = [ - ":pw_unit_test", - ] + public_deps = [ ":pw_unit_test" ] deps = [ ":simple_printing_event_handler", "$dir_pw_dumb_io", ] - sources = [ - "simple_printing_main.cc", - ] + sources = [ "simple_printing_main.cc" ] } # Library providing an event handler which logs using pw_log. @@ -74,30 +68,22 @@ if (dir_pw_log_backend != "") { "$dir_pw_log", "$dir_pw_preprocessor", ] - public = [ - "public/pw_unit_test/logging_event_handler.h", - ] + public = [ "public/pw_unit_test/logging_event_handler.h" ] sources = [ "logging_event_handler.cc" ] + public } source_set("logging_main") { - public_deps = [ - ":pw_unit_test", - ] + public_deps = [ ":pw_unit_test" ] deps = [ ":logging_event_handler", "$dir_pw_dumb_io", ] - sources = [ - "logging_main.cc", - ] + sources = [ "logging_main.cc" ] } } pw_test("framework_test") { - sources = [ - "framework_test.cc", - ] + sources = [ "framework_test.cc" ] } pw_test_group("tests") { diff --git a/pw_unit_test/test.gni b/pw_unit_test/test.gni index abb309844..d0c3c6bc4 100644 --- a/pw_unit_test/test.gni +++ b/pw_unit_test/test.gni @@ -55,12 +55,8 @@ template("pw_test") { _run_action_name = _test_target_name + "_run" pw_python_script(_run_action_name) { - deps = [ - ":$_test_target_name", - ] - inputs = [ - pw_automatic_test_runner, - ] + deps = [ ":$_test_target_name" ] + inputs = [ pw_automatic_test_runner ] script = "$dir_pw_unit_test/py/pw_unit_test/test_runner.py" args = [ "--runner", @@ -130,9 +126,7 @@ template("pw_test_group") { _test_group_deps = [ ":$_metadata_group_target" ] generated_file(_group_target) { - outputs = [ - "$target_out_dir/$target_name.testinfo.json", - ] + outputs = [ "$target_out_dir/$target_name.testinfo.json" ] data_keys = [ "group_deps", "self", @@ -147,9 +141,7 @@ template("pw_test_group") { # of the individual *_run targets and groups. if (pw_automatic_test_runner != "") { group(_group_target + "_run") { - deps = [ - ":$_group_target", - ] + deps = [ ":$_group_target" ] foreach(_target, _deps) { deps += [ "${_target}_run" ] } diff --git a/pw_varint/BUILD.gn b/pw_varint/BUILD.gn index b79418092..d1aa98c0d 100644 --- a/pw_varint/BUILD.gn +++ b/pw_varint/BUILD.gn @@ -20,16 +20,12 @@ config("default_config") { source_set("pw_varint") { public_configs = [ ":default_config" ] - public_deps = [ - "$dir_pw_span", - ] + public_deps = [ "$dir_pw_span" ] sources = [ "public/pw_varint/varint.h", "varint.cc", ] - public = [ - "public/pw_varint/varint.h", - ] + public = [ "public/pw_varint/varint.h" ] } pw_test_group("tests") { @@ -37,9 +33,7 @@ pw_test_group("tests") { } pw_test("varint_test") { - deps = [ - ":pw_varint", - ] + deps = [ ":pw_varint" ] sources = [ "varint_test.c", "varint_test.cc", diff --git a/targets/stm32f429i-disc1/BUILD.gn b/targets/stm32f429i-disc1/BUILD.gn index 3727e50f0..c129d8c33 100644 --- a/targets/stm32f429i-disc1/BUILD.gn +++ b/targets/stm32f429i-disc1/BUILD.gn @@ -15,7 +15,5 @@ import("$dir_pw_docgen/docs.gni") pw_doc_group("target_docs") { - sources = [ - "target_docs.rst", - ] + sources = [ "target_docs.rst" ] } |