Depend on config rule instead of file.
The aos_config rule used to require you to depend on {name}.json to get
the output. That was weird and hid private/testonly/etc. Instead,
depend on the rule directly.
Change-Id: I1596a6c1f44b246a0db1bbc562468530a0b69614
diff --git a/y2020/BUILD b/y2020/BUILD
index cd977f9..2d3f0e5 100644
--- a/y2020/BUILD
+++ b/y2020/BUILD
@@ -9,7 +9,7 @@
":setpoint_setter",
],
data = [
- ":config.json",
+ ":config",
],
start_binaries = [
"//aos/events/logging:logger_main",
@@ -29,7 +29,7 @@
"//y2020/vision:viewer",
],
data = [
- ":config.json",
+ ":config",
],
dirs = [
"//y2020/www:www_files",
@@ -218,7 +218,7 @@
name = "web_proxy",
srcs = ["web_proxy.sh"],
data = [
- ":config.json",
+ ":config",
"//aos/network:web_proxy_main",
"//y2020/www:camera_main_bundle",
"//y2020/www:field_main_bundle",
diff --git a/y2020/control_loops/drivetrain/BUILD b/y2020/control_loops/drivetrain/BUILD
index 0e06057..7e2ba18 100644
--- a/y2020/control_loops/drivetrain/BUILD
+++ b/y2020/control_loops/drivetrain/BUILD
@@ -122,7 +122,7 @@
cc_test(
name = "localizer_test",
srcs = ["localizer_test.cc"],
- data = [":simulation_config.json"],
+ data = [":simulation_config"],
deps = [
":drivetrain_base",
":localizer",
@@ -140,7 +140,7 @@
name = "drivetrain_replay_test",
srcs = ["drivetrain_replay_test.cc"],
data = [
- ":replay_config.json",
+ ":replay_config",
"@drivetrain_replay//file:spinning_wheels_while_still.bfbs",
],
deps = [
@@ -160,7 +160,7 @@
cc_binary(
name = "drivetrain_replay",
srcs = ["drivetrain_replay.cc"],
- data = ["//y2020:config.json"],
+ data = ["//y2020:config"],
deps = [
":drivetrain_base",
":localizer",
diff --git a/y2020/control_loops/superstructure/BUILD b/y2020/control_loops/superstructure/BUILD
index 4534404..e97fb12 100644
--- a/y2020/control_loops/superstructure/BUILD
+++ b/y2020/control_loops/superstructure/BUILD
@@ -88,7 +88,7 @@
"superstructure_lib_test.cc",
],
data = [
- "//y2020:config.json",
+ "//y2020:config",
],
deps = [
":superstructure_goal_fbs",
diff --git a/y2020/vision/BUILD b/y2020/vision/BUILD
index 8b73691..aaad085 100644
--- a/y2020/vision/BUILD
+++ b/y2020/vision/BUILD
@@ -32,7 +32,7 @@
"camera_reader.cc",
],
data = [
- "//y2020:config.json",
+ "//y2020:config",
],
restricted_to = [
"//tools:k8",
@@ -66,7 +66,7 @@
"viewer.cc",
],
data = [
- "//y2020:config.json",
+ "//y2020:config",
],
restricted_to = [
"//tools:k8",
@@ -88,7 +88,7 @@
"calibration.cc",
],
data = [
- "//y2020:config.json",
+ "//y2020:config",
],
restricted_to = [
"//tools:k8",
@@ -115,7 +115,7 @@
"viewer_replay.cc",
],
data = [
- "//y2020:config.json",
+ "//y2020:config",
],
restricted_to = [
"//tools:k8",