Common: Depend on cyber utils directly.

modules/common/configs/BUILD

@@ -24,9 +24,9 @@ cc_library(
     deps = [
         ":config_gflags",
         "//cyber/common:file",
+        "//cyber/common:macros",
         "//modules/common",
         "//modules/common/configs/proto:vehicle_config_proto",
-        "//modules/common/util",
         "@glog",
     ],
 )

modules/common/util/BUILD

@@ -12,6 +12,7 @@ cc_library(
         ":lru_cache",
         ":points_downsampler",
         ":string_util",
+        "//cyber/common:types",
         "//modules/common/math",
         "//modules/common/proto:pnc_point_proto",
         "//modules/common/time",

modules/data/tools/smart_recorder/BUILD

@@ -149,7 +149,8 @@ cc_library(
     hdrs = ["interval_pool.h"],
     deps = [
         "//cyber/common:log",
-        "//modules/common/util",
+        "//cyber/common:macros",
+        "@com_google_absl//absl/strings",
     ],
 )
 
@@ -158,8 +159,8 @@ cc_library(
     srcs = ["channel_pool.cc"],
     hdrs = ["channel_pool.h"],
     deps = [
+        "//cyber/common:macros",
         "//modules/common/adapters:adapter_gflags",
-        "//modules/common/util",
     ],
 )
 

modules/map/hdmap/BUILD

@@ -17,10 +17,11 @@ cc_library(
     ],
     copts = ["-DMODULE_NAME=\\\"map\\\""],
     deps = [
+        "//cyber/common:file",
+        "//cyber/common:macros",
         "//modules/common/configs:config_gflags",
         "//modules/common/math",
         "//modules/common/math:linear_interpolation",
-        "//modules/common/util",
         "//modules/map/hdmap/adapter:opendrive_adapter",
         "//modules/map/proto:map_proto",
         "//modules/map/relative_map/proto:navigation_proto",
@@ -36,8 +37,8 @@ cc_library(
     copts = ["-DMODULE_NAME=\\\"map\\\""],
     deps = [
         ":hdmap",
+        "//cyber/common:file",
         "//modules/common/configs:config_gflags",
-        "//modules/common/util",
         "//modules/map/relative_map/proto:navigation_proto",
         "@com_google_absl//absl/strings",
     ],
@@ -64,6 +65,7 @@ cc_test(
     ],
     deps = [
         ":hdmap",
+        "//cyber/common:file",
         "@glog",
         "@gtest//:main",
     ],

modules/map/tools/BUILD

@@ -6,10 +6,9 @@ cc_binary(
     name = "map_tool",
     srcs = ["map_tool.cc"],
     deps = [
+        "//cyber/common:file",
         "//external:gflags",
-        "//modules/common",
         "//modules/common/configs:config_gflags",
-        "//modules/common/util",
         "//modules/map/hdmap:hdmap_util",
         "//modules/map/proto:map_proto",
     ],
@@ -31,8 +30,9 @@ cc_binary(
     name = "refresh_default_end_way_point",
     srcs = ["refresh_default_end_way_point.cc"],
     deps = [
+        "//cyber/common:file",
+        "//cyber/common:macros",
         "//modules/common/configs:config_gflags",
-        "//modules/common/util",
         "//modules/map/hdmap:hdmap_util",
         "//modules/routing/proto:routing_proto",
     ],
@@ -58,8 +58,7 @@ cc_binary(
     srcs = ["proto_map_generator.cc"],
     deps = [
         "//external:gflags",
-        "//modules/common",
-        "//modules/common/util",
+        "//cyber/common:file",
         "//modules/map/hdmap:hdmap_util",
         "//modules/map/hdmap/adapter:opendrive_adapter",
         "//modules/map/proto:map_proto",