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/events/BUILD

diff --git a/aos/events/BUILD b/aos/events/BUILD
index f36da1e..e53be2f 100644
--- a/aos/events/BUILD
+++ b/aos/events/BUILD
@@ -142,7 +142,7 @@
 )
 
 aos_config(
-    name = "config",
+    name = "aos_config",
     src = "aos.json",
     flatbuffers = [
         ":event_loop_fbs",
@@ -161,7 +161,7 @@
         ":pong_fbs",
     ],
     target_compatible_with = ["@platforms//os:linux"],
-    deps = [":config"],
+    deps = [":aos_config"],
 )
 
 [
@@ -177,7 +177,7 @@
             "//aos/network:message_bridge_server_fbs",
         ],
         target_compatible_with = ["@platforms//os:linux"],
-        deps = [":config"],
+        deps = [":aos_config"],
     )
     for config in [
         "multinode_pingpong_test_split",
@@ -448,7 +448,7 @@
         "glib_main_loop_test.cc",
     ],
     data = [
-        ":config",
+        ":aos_config",
     ],
     deps = [
         ":glib_main_loop",

aos/events/glib_main_loop_test.cc

diff --git a/aos/events/glib_main_loop_test.cc b/aos/events/glib_main_loop_test.cc
index b857b0b..9f72e54 100644
--- a/aos/events/glib_main_loop_test.cc
+++ b/aos/events/glib_main_loop_test.cc
@@ -15,7 +15,7 @@
 
 const FlatbufferDetachedBuffer<Configuration> &Config() {
   static const FlatbufferDetachedBuffer<Configuration> result =
-      configuration::ReadConfig(ArtifactPath("aos/events/config.json"));
+      configuration::ReadConfig(ArtifactPath("aos/events/aos_config.json"));
   return result;
 }
 

aos/events/logging/BUILD

diff --git a/aos/events/logging/BUILD b/aos/events/logging/BUILD
index ec13f92..272bee4 100644
--- a/aos/events/logging/BUILD
+++ b/aos/events/logging/BUILD
@@ -383,7 +383,7 @@
         "//aos/network:timestamp_fbs",
     ],
     target_compatible_with = ["@platforms//os:linux"],
-    deps = ["//aos/events:config"],
+    deps = ["//aos/events:aos_config"],
 )
 
 aos_config(
@@ -398,7 +398,7 @@
         "//aos/network:timestamp_fbs",
     ],
     target_compatible_with = ["@platforms//os:linux"],
-    deps = ["//aos/events:config"],
+    deps = ["//aos/events:aos_config"],
 )
 
 aos_config(
@@ -413,7 +413,7 @@
         "//aos/network:timestamp_fbs",
     ],
     target_compatible_with = ["@platforms//os:linux"],
-    deps = ["//aos/events:config"],
+    deps = ["//aos/events:aos_config"],
 )
 
 cc_test(

aos/events/logging/logger_main.cc

diff --git a/aos/events/logging/logger_main.cc b/aos/events/logging/logger_main.cc
index 4874c77..aa6f25b 100644
--- a/aos/events/logging/logger_main.cc
+++ b/aos/events/logging/logger_main.cc
@@ -10,7 +10,7 @@
 #include "gflags/gflags.h"
 #include "glog/logging.h"
 
-DEFINE_string(config, "config.json", "Config file to use.");
+DEFINE_string(config, "aos_config.json", "Config file to use.");
 
 DEFINE_bool(skip_renicing, false,
             "If true, skip renicing the logger.  This leaves it lower priority "