arc: Fix ordering within gn targets based on style guide
https://gn.googlesource.com/gn/+/HEAD/docs/style_guide.md#Ordering-within-a-target
BUG=none
TEST=run gnlint with crrev.com/c/1830489
TEST=FEATURES=test emerge-amd64-generic arc-adbd arc-data-snapshotd arc-keymaster arc-obb-mounter
TEST=emerge-amd64-generic arc-setup
Change-Id: I3d181d25d2dbd8a61e636e8f328b6af301607bb5
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform2/+/2586459
Reviewed-by: Hidehiko Abe <hidehiko@chromium.org>
Commit-Queue: Tatsuhisa Yamaguchi <yamaguchi@chromium.org>
Tested-by: Tatsuhisa Yamaguchi <yamaguchi@chromium.org>
diff --git a/arc/adbd/BUILD.gn b/arc/adbd/BUILD.gn
index 082a5a2..16858bf 100644
--- a/arc/adbd/BUILD.gn
+++ b/arc/adbd/BUILD.gn
@@ -43,9 +43,8 @@
executable("arc-adbd") {
sources = [ "adbd_main.cc" ]
-
- deps = [ ":libarcadbd" ]
configs += [ ":config" ]
+ deps = [ ":libarcadbd" ]
}
# Fuzzer only.
@@ -90,6 +89,7 @@
if (use.test) {
executable("arcvm_sock_to_usb_test") {
+ sources = [ "arcvm_sock_to_usb_test.cc" ]
configs += [
"//common-mk:test",
":config",
@@ -98,10 +98,10 @@
":libarcadbd",
"//common-mk/testrunner:testrunner",
]
- sources = [ "arcvm_sock_to_usb_test.cc" ]
run_test = true
}
executable("arcvm_usb_to_sock_test") {
+ sources = [ "arcvm_usb_to_sock_test.cc" ]
configs += [
"//common-mk:test",
":config",
@@ -110,7 +110,6 @@
":libarcadbd",
"//common-mk/testrunner:testrunner",
]
- sources = [ "arcvm_usb_to_sock_test.cc" ]
run_test = true
}
}
diff --git a/arc/container/obb-mounter/BUILD.gn b/arc/container/obb-mounter/BUILD.gn
index b88a7e9..ed7a7df 100644
--- a/arc/container/obb-mounter/BUILD.gn
+++ b/arc/container/obb-mounter/BUILD.gn
@@ -131,11 +131,11 @@
if (use.fuzzer) {
executable("mount-obb_fuzzer") {
+ sources = [ "mount_obb_fuzzer.cc" ]
configs += [
"//common-mk/common_fuzzer",
":target_defaults",
]
- sources = [ "mount_obb_fuzzer.cc" ]
deps = [ ":libmount_obb" ]
}
}
diff --git a/arc/data-snapshotd/BUILD.gn b/arc/data-snapshotd/BUILD.gn
index 454a721..263b7d2 100644
--- a/arc/data-snapshotd/BUILD.gn
+++ b/arc/data-snapshotd/BUILD.gn
@@ -37,37 +37,37 @@
# Generates proto definitions.
proto_library("arc-data-snapshotd-protos") {
+ sources = [ "proto/directory.proto" ]
proto_in_dir = "proto/"
proto_out_dir = "include/proto"
- sources = [ "proto/directory.proto" ]
standalone = true
}
source_set("libarc-data-snapshotd") {
- configs += [ ":common_pkg_deps" ]
sources = [
"dbus_adaptor.cc",
"file_utils.cc",
]
+ configs += [ ":common_pkg_deps" ]
deps = [ ":arc-data-snapshotd-protos" ]
}
generate_dbus_adaptors("data_snapshotd_adaptors") {
+ sources = [ "dbus_bindings/org.chromium.ArcDataSnapshotd.xml" ]
dbus_service_config = "dbus_bindings/dbus-service-config.json"
dbus_adaptors_out_dir = "include/dbus_adaptors"
- sources = [ "dbus_bindings/org.chromium.ArcDataSnapshotd.xml" ]
}
executable("arc-data-snapshotd") {
+ sources = [
+ "daemon.cc",
+ "main.cc",
+ ]
configs += [ ":common_pkg_deps" ]
deps = [
":data_snapshotd_adaptors",
":libarc-data-snapshotd",
]
- sources = [
- "daemon.cc",
- "main.cc",
- ]
}
if (use.test) {
@@ -87,6 +87,7 @@
]
}
executable("arc-data-snapshotd_test") {
+ sources = [ "dbus_adaptor_test.cc" ]
configs += [
":test_pkg_deps",
"//common-mk:test",
@@ -96,6 +97,5 @@
":libarc-data-snapshotd",
"//common-mk/testrunner:testrunner",
]
- sources = [ "dbus_adaptor_test.cc" ]
}
}
diff --git a/arc/keymaster/BUILD.gn b/arc/keymaster/BUILD.gn
index 7a3109f..d74d893 100644
--- a/arc/keymaster/BUILD.gn
+++ b/arc/keymaster/BUILD.gn
@@ -84,9 +84,11 @@
"//common-mk:visibility_default",
":boringssl_config",
]
+
# NOSORT
pkg_deps = [
"libchrome",
+
# system_api depends on protobuf. It must appear before protobuf here so the
# linker flags are in the right order.
"system_api",
@@ -217,14 +219,14 @@
pkg_deps = [ "libchrome" ]
}
executable("arc_keymasterd_fuzzer") {
- configs += [
- "//common-mk/common_fuzzer:common_fuzzer",
- ":arc_keymasterd_fuzzer_config",
- ]
sources = [
"conversion.cc",
"conversion_fuzzer.cc",
]
+ configs += [
+ "//common-mk/common_fuzzer:common_fuzzer",
+ ":arc_keymasterd_fuzzer_config",
+ ]
deps = [
":keymaster_mojo_bindings",
":libarckeymaster_context",
diff --git a/arc/setup/BUILD.gn b/arc/setup/BUILD.gn
index c29dd51..c0594d9 100644
--- a/arc/setup/BUILD.gn
+++ b/arc/setup/BUILD.gn
@@ -182,21 +182,21 @@
}
if (use.fuzzer) {
+ sources = [ "arc_setup_util_find_all_properties_fuzzer.cc" ]
executable("arc_setup_util_find_all_properties_fuzzer") {
configs += [
"//common-mk/common_fuzzer",
":target_defaults",
]
- sources = [ "arc_setup_util_find_all_properties_fuzzer.cc" ]
deps = [ ":libarc_setup" ]
}
executable("arc_setup_util_find_fingerprint_and_sdk_version_fuzzer") {
+ sources = [ "arc_setup_util_find_fingerprint_and_sdk_version_fuzzer.cc" ]
configs += [
"//common-mk/common_fuzzer",
":target_defaults",
]
- sources = [ "arc_setup_util_find_fingerprint_and_sdk_version_fuzzer.cc" ]
deps = [ ":libarc_setup" ]
}
}
