commit c5fa6d9d4b07f090dc99454a97898b92f284dfb6
author Austin Schuh <austin.linux@gmail.com> Fri Feb 25 14:36:28 2022 -0800
committer Austin Schuh <austin.linux@gmail.com> Fri Feb 25 18:50:41 2022 -0800
tree 5cdad624e9cb8f22e4b2fc481b91326d6fceecd8
parent d41f501ef433bbafaac3db9bbfaeba63f04eb3d1

Rename config.json to aos_config.json

Plenty of other things are called config.json, so let's pick a more
unique name.

Change-Id: I6510a172ec62674dd1b11bd71cef9aac2480c612
Signed-off-by: Austin Schuh <austin.linux@gmail.com>

aos/network/BUILD

diff --git a/aos/network/BUILD b/aos/network/BUILD
index 323a334..bc68c90 100644
--- a/aos/network/BUILD
+++ b/aos/network/BUILD
@@ -354,7 +354,7 @@
         "//aos/network:timestamp_fbs",
     ],
     target_compatible_with = ["@platforms//os:linux"],
-    deps = ["//aos/events:config"],
+    deps = ["//aos/events:aos_config"],
 )
 
 aos_config(
@@ -369,7 +369,7 @@
         "//aos/network:timestamp_fbs",
     ],
     target_compatible_with = ["@platforms//os:linux"],
-    deps = ["//aos/events:config"],
+    deps = ["//aos/events:aos_config"],
 )
 
 cc_test(

aos/network/message_bridge_client.cc

diff --git a/aos/network/message_bridge_client.cc b/aos/network/message_bridge_client.cc
index 61a7271..301dfd9 100644
--- a/aos/network/message_bridge_client.cc
+++ b/aos/network/message_bridge_client.cc
@@ -3,7 +3,7 @@
 #include "aos/events/shm_event_loop.h"
 #include "aos/init.h"
 
-DEFINE_string(config, "config.json", "Path to the config.");
+DEFINE_string(config, "aos_config.json", "Path to the config.");
 DEFINE_int32(rt_priority, -1, "If > 0, run as this RT priority");
 
 namespace aos {

aos/network/message_bridge_server.cc

diff --git a/aos/network/message_bridge_server.cc b/aos/network/message_bridge_server.cc
index 9f336c0..fc1425d 100644
--- a/aos/network/message_bridge_server.cc
+++ b/aos/network/message_bridge_server.cc
@@ -4,7 +4,7 @@
 #include "gflags/gflags.h"
 #include "glog/logging.h"
 
-DEFINE_string(config, "config.json", "Path to the config.");
+DEFINE_string(config, "aos_config.json", "Path to the config.");
 DEFINE_int32(rt_priority, -1, "If > 0, run as this RT priority");
 
 namespace aos {

aos/network/web_proxy_main.cc

diff --git a/aos/network/web_proxy_main.cc b/aos/network/web_proxy_main.cc
index f3ad926..4482ad0 100644
--- a/aos/network/web_proxy_main.cc
+++ b/aos/network/web_proxy_main.cc
@@ -4,7 +4,7 @@
 #include "aos/network/web_proxy.h"
 #include "gflags/gflags.h"
 
-DEFINE_string(config, "./config.json", "File path of aos configuration");
+DEFINE_string(config, "./aos_config.json", "File path of aos configuration");
 DEFINE_string(data_dir, "www", "Directory to serve data files from");
 DEFINE_int32(buffer_size, 1000000,
              "-1 if infinite, in bytes / channel. If there are no active "

aos/network/www/BUILD

diff --git a/aos/network/www/BUILD b/aos/network/www/BUILD
index f62ed67..1b00af7 100644
--- a/aos/network/www/BUILD
+++ b/aos/network/www/BUILD
@@ -158,7 +158,7 @@
     target_compatible_with = ["@platforms//os:linux"],
     visibility = ["//visibility:public"],
     deps = [
-        "//aos/events:config",
+        "//aos/events:aos_config",
     ],
 )
 
@@ -179,7 +179,7 @@
         ":reflection_test_bundle.min.js",
         ":test_config",
         "//aos/network:web_proxy_main",
-        "//y2020:config",
+        "//y2020:aos_config",
     ],
     target_compatible_with = ["@platforms//os:linux"],
 )