[build] Fix sources to compiling targets
Recent changes to GN require only buildable files to be included in
sources. See crbug.com/gn/77 for additional details
Change-Id: Ie93475311374bcdac92ed189644b91aa78b8b56d
diff --git a/src/connectivity/bluetooth/core/bt-host/hci/BUILD.gn b/src/connectivity/bluetooth/core/bt-host/hci/BUILD.gn
index 64949bb..13dc19d 100644
--- a/src/connectivity/bluetooth/core/bt-host/hci/BUILD.gn
+++ b/src/connectivity/bluetooth/core/bt-host/hci/BUILD.gn
@@ -80,7 +80,6 @@
testonly = true
sources = [
- "//src/lib/fxl",
"fake_connection.cc",
"fake_connection.h",
"fake_local_address_delegate.cc",
@@ -90,6 +89,10 @@
public_deps = [
":hci",
]
+
+ deps = [
+ "//src/lib/fxl",
+ ]
}
source_set("tests") {
diff --git a/src/graphics/lib/compute/hotsort/platforms/vk/targets/hotsort_target.gni b/src/graphics/lib/compute/hotsort/platforms/vk/targets/hotsort_target.gni
index 653a7a4..ed971a9 100644
--- a/src/graphics/lib/compute/hotsort/platforms/vk/targets/hotsort_target.gni
+++ b/src/graphics/lib/compute/hotsort/platforms/vk/targets/hotsort_target.gni
@@ -42,9 +42,12 @@
# serves a dual role of providing the name of files as well as being
# a symbol in the GLSL source and C include files.
#
- assert(defined(invoker.hotsort_target_vendor_dir),"vendor directory must be defined for hotsort_target")
- assert(defined(invoker.hotsort_target_name), "name must be defined for hotsort_target")
- assert(defined(invoker.hotsort_target_args), "args must be defined for hotsort_target")
+ assert(defined(invoker.hotsort_target_vendor_dir),
+ "vendor directory must be defined for hotsort_target")
+ assert(defined(invoker.hotsort_target_name),
+ "name must be defined for hotsort_target")
+ assert(defined(invoker.hotsort_target_args),
+ "args must be defined for hotsort_target")
#
# Either dump a binary or produce a source set
@@ -58,26 +61,21 @@
#
# define sources, includes and deps
#
- _hs_target_gen_includes_public = [
- "$target_gen_dir/hs_target.h"
- ]
+ _hs_target_gen_includes_public = [ "$target_gen_dir/hs_target.h" ]
- _hs_target_gen_includes = [
- "$target_gen_dir/hs_config.h",
- ] + _hs_target_gen_includes_public
+ _hs_target_gen_includes =
+ [ "$target_gen_dir/hs_config.h" ] + _hs_target_gen_includes_public
- _hs_target_includes = [
- invoker.hotsort_target_vendor_dir,
- "//src/graphics/lib/compute/hotsort/platforms/vk/targets"
- ] + _hs_target_gen_includes
+ _hs_target_includes =
+ [
+ invoker.hotsort_target_vendor_dir,
+ "//src/graphics/lib/compute/hotsort/platforms/vk/targets",
+ ] + _hs_target_gen_includes
- _hs_target_gen_sources = [
- "$target_gen_dir/" + invoker.hotsort_target_name + ".c",
- ]
+ _hs_target_gen_sources =
+ [ "$target_gen_dir/" + invoker.hotsort_target_name + ".c" ]
- _hs_target_gen_inlines = [
- "$target_gen_dir/hs_modules.inl",
- ]
+ _hs_target_gen_inlines = [ "$target_gen_dir/hs_modules.inl" ]
_hs_target_include_dirs = [
"$target_gen_dir",
@@ -85,15 +83,19 @@
"//src/graphics/lib/compute/hotsort/platforms/vk",
]
- _hs_target_sources = _hs_target_includes + _hs_target_gen_sources + _hs_target_gen_inlines
+ _hs_target_sources =
+ _hs_target_gen_includes + _hs_target_gen_sources + _hs_target_gen_inlines
#
# generated compute shaders
#
- _hs_comp_names = exec_script("//src/graphics/lib/compute/hotsort/platforms/vk/targets/hotsort_comp_names.py",
- invoker.hotsort_target_args,
- "list lines")
- _hs_comp_sources = process_file_template(_hs_comp_names,"$target_gen_dir/comp/{{source_file_part}}")
+ _hs_comp_names = exec_script(
+ "//src/graphics/lib/compute/hotsort/platforms/vk/targets/hotsort_comp_names.py",
+ invoker.hotsort_target_args,
+ "list lines")
+ _hs_comp_sources =
+ process_file_template(_hs_comp_names,
+ "$target_gen_dir/comp/{{source_file_part}}")
#
# generate the .comp shaders
@@ -101,11 +103,13 @@
# Note that hs_modules.txt should match names returned by script
#
compiled_action("gen_comp") {
- tool = "//src/graphics/lib/compute/hotsort/hotsort_gen"
- outputs = _hs_comp_sources + _hs_target_gen_sources + _hs_target_gen_includes
- args = [
- "-D" , invoker.hotsort_target_name
- ] + invoker.hotsort_target_args
+ tool = "//src/graphics/lib/compute/hotsort/hotsort_gen"
+ outputs =
+ _hs_comp_sources + _hs_target_gen_sources + _hs_target_gen_includes
+ args = [
+ "-D",
+ invoker.hotsort_target_name,
+ ] + invoker.hotsort_target_args
}
#
@@ -114,23 +118,27 @@
compiled_action_foreach("gen_spv") {
tool = "//third_party/shaderc/third_party/glslang:glslangValidator"
sources = _hs_comp_sources
- inputs = _hs_target_includes
+ inputs = _hs_target_includes
outputs = [
- "$target_gen_dir/spv/{{source_name_part}}.spv"
+ "$target_gen_dir/spv/{{source_name_part}}.spv",
]
args = [
- "-s", # Note: '-s' silences glslangValidator printing filename
- # but detailed error messages are also silenced
- "--target-env", "vulkan1.1",
- "-I" + rebase_path(target_gen_dir,root_build_dir), # <target>
- "-I" + rebase_path(invoker.hotsort_target_vendor_dir,root_build_dir), # <vendor>
- "-I" + rebase_path("//src/graphics/lib/compute/hotsort/platforms/vk/targets",root_build_dir), # <default>
+ "-s", # Note: '-s' silences glslangValidator printing filename
+ # but detailed error messages are also silenced
+
+ "--target-env",
+ "vulkan1.1",
+ "-I" + rebase_path(target_gen_dir, root_build_dir), # <target>
+ "-I" + rebase_path(invoker.hotsort_target_vendor_dir, root_build_dir), # <vendor>
+ "-I" +
+ rebase_path("//src/graphics/lib/compute/hotsort/platforms/vk/targets",
+ root_build_dir), # <default>
"-o",
- rebase_path(outputs[0],root_build_dir),
- "{{source}}"
+ rebase_path(outputs[0], root_build_dir),
+ "{{source}}",
]
public_deps = [
- ":gen_comp"
+ ":gen_comp",
]
}
@@ -141,16 +149,16 @@
tool = "//third_party/shaderc/third_party/spirv-tools:spirv-opt"
sources = get_target_outputs(":gen_spv")
outputs = [
- "$target_gen_dir/opt/{{source_name_part}}.spv"
+ "$target_gen_dir/opt/{{source_name_part}}.spv",
]
args = [
"-O",
"{{source}}",
"-o",
- rebase_path(outputs[0],root_build_dir),
+ rebase_path(outputs[0], root_build_dir),
]
public_deps = [
- ":gen_spv"
+ ":gen_spv",
]
}
@@ -161,17 +169,17 @@
tool = "//third_party/shaderc/third_party/glslang:spirv-remap"
sources = get_target_outputs(":gen_opt")
outputs = [
- "$target_gen_dir/remap/{{source_name_part}}.spv"
+ "$target_gen_dir/remap/{{source_name_part}}.spv",
]
args = [
"--do-everything",
"--input",
"{{source}}",
"--output",
- rebase_path(target_gen_dir,root_build_dir) + "/remap"
+ rebase_path(target_gen_dir, root_build_dir) + "/remap",
]
public_deps = [
- ":gen_opt"
+ ":gen_opt",
]
}
@@ -182,9 +190,10 @@
tool = "//src/graphics/lib/compute/hotsort/platforms/vk/targets:hotsort_modules_to_literals"
sources = get_target_outputs(":gen_remap")
outputs = _hs_target_gen_inlines
- args = rebase_path(outputs,root_build_dir) + rebase_path(sources,root_build_dir)
+ args = rebase_path(outputs, root_build_dir) +
+ rebase_path(sources, root_build_dir)
public_deps = [
- ":gen_remap"
+ ":gen_remap",
]
}
@@ -202,7 +211,7 @@
sources = _hs_target_gen_sources
include_dirs = _hs_target_include_dirs
public_deps = [
- ":gen_modules"
+ ":gen_modules",
]
}
@@ -213,11 +222,11 @@
tool = ":$_hs_target_dump_name"
sources = _hs_target_sources
outputs = [
- "$target_gen_dir/hs_target.bin"
+ "$target_gen_dir/hs_target.bin",
]
- args = rebase_path(outputs,root_build_dir)
+ args = rebase_path(outputs, root_build_dir)
public_deps = [
- ":$_hs_target_dump_name"
+ ":$_hs_target_dump_name",
]
}
@@ -226,7 +235,7 @@
#
group(target_name) {
public_deps = [
- ":gen_bin($host_toolchain)"
+ ":gen_bin($host_toolchain)",
]
}
} else {
@@ -234,7 +243,9 @@
# target is a source set
#
source_set(target_name) {
- public = [ "$target_gen_dir/hs_target.h" ]
+ public = [
+ "$target_gen_dir/hs_target.h",
+ ]
sources = _hs_target_sources
include_dirs = _hs_target_include_dirs
public_deps = [
@@ -243,7 +254,6 @@
}
}
}
-
#
#
#
diff --git a/src/graphics/lib/compute/spinel/BUILD.gn b/src/graphics/lib/compute/spinel/BUILD.gn
index 3abee6f..60d514c 100644
--- a/src/graphics/lib/compute/spinel/BUILD.gn
+++ b/src/graphics/lib/compute/spinel/BUILD.gn
@@ -5,13 +5,11 @@
source_set("spinel") {
public = [
"spinel.h",
- "spinel_types.h",
- "spinel_result.h",
"spinel_assert.h",
+ "spinel_result.h",
+ "spinel_types.h",
]
- friend = [
- "platforms/vk"
- ]
+ friend = [ "platforms/vk" ]
sources = [
"allocator_host.c",
"allocator_host.h",
@@ -24,7 +22,6 @@
"handle.h",
"path_builder.c",
"path_builder.h",
- "platforms",
"raster_builder.c",
"raster_builder.h",
"spinel.h",
@@ -40,9 +37,7 @@
"weakref.c",
"weakref.h",
]
- include_dirs = [
- "//src/graphics/lib/compute",
- ]
+ include_dirs = [ "//src/graphics/lib/compute" ]
deps = [
"//src/graphics/lib/compute/common",
]
