V2X: rename and split targets

modules/v2x/fusion/apps/BUILD

@@ -11,13 +11,11 @@ cc_library(
         "-DMODULE_NAME=\\\"v2x_fusion\\\"",
     ],
     deps = [
-        "//cyber/common:file",
-        "//modules/common/math",
-        "//modules/v2x/fusion/apps/common:apps_common",
-        "//modules/v2x/fusion/configs:v2x_configs_lib",
-        "//modules/v2x/fusion/libs/common/base",
-        "//modules/v2x/fusion/libs/fusion:v2x_fusion_lib",
-        "@boost",
+        "//cyber/component",
+        "//modules/v2x/fusion/apps/common:trans_tools",
+        "//modules/v2x/fusion/configs:ft_config_manager",
+        "//modules/v2x/fusion/configs:fusion_tracker_gflags",
+        "//modules/v2x/fusion/libs/fusion",
     ],
     alwayslink = True,
 )

modules/v2x/fusion/apps/common/BUILD

@@ -4,23 +4,24 @@ load("//tools:cpplint.bzl", "cpplint")
 package(default_visibility = ["//visibility:public"])
 
 cc_library(
-    name = "apps_common",
-    srcs = [
-        "trans_tools.cc",
-    ],
-    hdrs = [
-        "ft_definitions.h",
-        "trans_tools.h",
-    ],
-    copts = ['-DMODULE_NAME=\\"v2x_fusion\\"'],
+    name = "ft_definitions",
+    hdrs = ["ft_definitions.h"],
     deps = [
-        "//cyber",
-        "//modules/common/math",
         "//modules/localization/proto:localization_cc_proto",
         "//modules/perception/proto:perception_camera_cc_proto",
-        "//modules/v2x/fusion/libs/common/base",
+        "//modules/v2x/fusion/libs/common:v2x_object",
         "//modules/v2x/proto:v2x_obstacles_cc_proto",
     ],
 )
 
+cc_library(
+    name = "trans_tools",
+    srcs = ["trans_tools.cc"],
+    hdrs = ["trans_tools.h"],
+    copts = ['-DMODULE_NAME=\\"v2x_fusion\\"'],
+    deps = [
+        ":ft_definitions",
+    ],
+)
+
 cpplint()

modules/v2x/fusion/apps/common/ft_definitions.h

@@ -22,7 +22,7 @@
 #include "modules/perception/proto/perception_obstacle.pb.h"
 #include "modules/v2x/proto/v2x_obstacles.pb.h"
 
-#include "modules/v2x/fusion/libs/common/base/v2x_object.h"
+#include "modules/v2x/fusion/libs/common/v2x_object.h"
 
 namespace apollo {
 namespace v2x {

modules/v2x/fusion/apps/common/trans_tools.cc

@@ -16,7 +16,6 @@
 
 #include "modules/v2x/fusion/apps/common/trans_tools.h"
 
-#include <iostream>
 #include <limits>
 
 namespace apollo {

modules/v2x/fusion/apps/v2x_fusion_component.h

@@ -27,7 +27,6 @@
 #include <vector>
 
 #include "cyber/component/component.h"
-#include "cyber/cyber.h"
 #include "modules/v2x/fusion/apps/common/trans_tools.h"
 #include "modules/v2x/fusion/configs/ft_config_manager.h"
 #include "modules/v2x/fusion/configs/fusion_tracker_gflags.h"

modules/v2x/fusion/configs/BUILD

@@ -3,22 +3,10 @@ load("//tools:cpplint.bzl", "cpplint")
 
 package(default_visibility = ["//visibility:public"])
 
-cc_library(
-    name = "v2x_configs_lib",
-    deps = [
-        ":ft_config_manager",
-        ":fusion_tracker_gflags",
-    ],
-)
-
 cc_library(
     name = "fusion_tracker_gflags",
-    srcs = [
-        "fusion_tracker_gflags.cc",
-    ],
-    hdrs = [
-        "fusion_tracker_gflags.h",
-    ],
+    srcs = ["fusion_tracker_gflags.cc"],
+    hdrs = ["fusion_tracker_gflags.h"],
     deps = [
         "@com_github_gflags_gflags//:gflags",
     ],
@@ -26,12 +14,8 @@ cc_library(
 
 cc_library(
     name = "ft_config_manager",
-    srcs = [
-        "ft_config_manager.cc",
-    ],
-    hdrs = [
-        "ft_config_manager.h",
-    ],
+    srcs = ["ft_config_manager.cc"],
+    hdrs = ["ft_config_manager.h"],
     deps = [
         ":fusion_tracker_gflags",
         "//cyber",
@@ -44,7 +28,7 @@ cc_test(
     size = "small",
     srcs = ["ft_config_manager_test.cc"],
     deps = [
-        ":v2x_configs_lib",
+        ":ft_config_manager",
         "@com_google_googletest//:gtest_main",
     ],
 )

modules/v2x/fusion/libs/common/base/BUILD → modules/v2x/fusion/libs/common/BUILD

@@ -4,7 +4,7 @@ load("//tools:cpplint.bzl", "cpplint")
 package(default_visibility = ["//visibility:public"])
 
 cc_library(
-    name = "base",
+    name = "v2x_object",
     hdrs = [
         "v2x_object.h",
     ],
@@ -21,7 +21,7 @@ cc_test(
     size = "small",
     srcs = ["v2x_object_test.cc"],
     deps = [
-        ":base",
+        ":v2x_object",
         "@com_google_googletest//:gtest_main",
     ],
 )

modules/v2x/fusion/libs/common/base/v2x_object_test.cc → modules/v2x/fusion/libs/common/v2x_object_test.cc

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  *****************************************************************************/
-#include "modules/v2x/fusion/libs/common/base/v2x_object.h"
+#include "modules/v2x/fusion/libs/common/v2x_object.h"
 
 #include "gtest/gtest.h"
 

modules/v2x/fusion/libs/fusion/BUILD

@@ -4,21 +4,31 @@ load("//tools:cpplint.bzl", "cpplint")
 package(default_visibility = ["//visibility:public"])
 
 cc_library(
-    name = "v2x_fusion_lib",
-    srcs = [
-        "fusion.cc",
+    name = "fusion",
+    srcs = ["fusion.cc"],
+    hdrs = ["fusion.h"],
+    copts = ['-DMODULE_NAME=\\"v2x_fusion\\"'],
+    deps = [
+        ":km",
+        "//modules/v2x/fusion/configs:ft_config_manager",
+        "//modules/v2x/fusion/libs/common:v2x_object",
+        "@eigen",
     ],
-    hdrs = [
-        "fusion.h",
-        "km.h",
-        "test_tools.h",
+)
+
+cc_library(
+    name = "km",
+    hdrs = ["km.h"],
+    deps = [
+        "@eigen",
     ],
-    copts = ['-DMODULE_NAME=\\"v2x_fusion\\"'],
+)
+
+cc_library(
+    name = "test_tools",
+    hdrs = ["test_tools.h"],
     deps = [
-        "//cyber",
-        "//modules/common/math",
-        "//modules/v2x/fusion/configs:v2x_configs_lib",
-        "//modules/v2x/fusion/libs/common/base",
+        "//modules/v2x/fusion/libs/common:v2x_object",
     ],
 )
 
@@ -27,7 +37,8 @@ cc_test(
     size = "small",
     srcs = ["fusion_test.cc"],
     deps = [
-        ":v2x_fusion_lib",
+        ":fusion",
+        ":test_tools",
         "@com_google_googletest//:gtest_main",
     ],
 )
@@ -37,7 +48,7 @@ cc_test(
     size = "small",
     srcs = ["km_test.cc"],
     deps = [
-        ":v2x_fusion_lib",
+        ":km",
         "@com_google_googletest//:gtest_main",
     ],
 )

modules/v2x/fusion/libs/fusion/fusion.h

@@ -28,7 +28,7 @@
 #include <Eigen/Core>
 
 #include "modules/v2x/fusion/configs/ft_config_manager.h"
-#include "modules/v2x/fusion/libs/common/base/v2x_object.h"
+#include "modules/v2x/fusion/libs/common/v2x_object.h"
 #include "modules/v2x/fusion/libs/fusion/km.h"
 
 namespace apollo {

modules/v2x/fusion/libs/fusion/test_tools.h

@@ -19,7 +19,7 @@
 #include <string>
 #include <vector>
 
-#include "modules/v2x/fusion/libs/common/base/v2x_object.h"
+#include "modules/v2x/fusion/libs/common/v2x_object.h"
 
 namespace apollo {
 namespace v2x {