Fix errors in Bazel build (#141)

Updated Bazel build to reflect recent changes in codebase. Signed-off-by: Derek Foster <[email protected]>
ipdk-io · Jun 13, 2024 · 7729eb9 · 7729eb9
1 parent 3aeff0b
commit 7729eb9
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 16 deletions.
diff --git a/switchapi/es2k/BUILD.bazel b/switchapi/es2k/BUILD.bazel
@@ -18,11 +18,6 @@ SWITCH_PD_LAG_HDR = select({
     "//flags:lnw_v3": ["//switchapi/es2k/lnw_v3:switch_pd_lag_hdr"],
 })
 
-SWITCH_PD_P4_NAME_ROUTING = select({
-    "//flags:lnw_v2": ["//switchapi/es2k/lnw_v2:switch_pd_p4_name_routing"],
-    "//flags:lnw_v3": ["//switchapi/es2k/lnw_v3:switch_pd_p4_name_routing"],
-})
-
 SWITCH_PD_ROUTING = select({
     "//flags:lnw_v2": ["//switchapi/es2k/lnw_v2:switch_pd_routing"],
     "//flags:lnw_v3": ["//switchapi/es2k/lnw_v3:switch_pd_routing"],
@@ -169,10 +164,17 @@ krnlmon_cc_library(
     hdrs = ["switch_pd_p4_name_mapping.h"],
 )
 
+krnlmon_cc_library(
+    name = "switch_pd_p4_name_routing",
+    hdrs = ["switch_pd_p4_name_routing.h"],
+)
+
 krnlmon_cc_library(
     name = "switch_pd_routing_hdr",
     hdrs = ["switch_pd_routing.h"],
-    deps = SWITCH_PD_P4_NAME_ROUTING,
+    deps = [
+        ":switch_pd_p4_name_routing",
+    ],
 )
 
 krnlmon_cc_library(

diff --git a/switchapi/es2k/lnw_v2/BUILD.bazel b/switchapi/es2k/lnw_v2/BUILD.bazel
@@ -27,11 +27,6 @@ krnlmon_cc_library(
     ],
 )
 
-krnlmon_cc_library(
-    name = "switch_pd_p4_name_routing",
-    hdrs = ["switch_pd_p4_name_routing.h"],
-)
-
 krnlmon_cc_library(
     name = "switch_pd_routing",
     srcs = ["switch_pd_routing.c"],

diff --git a/switchapi/es2k/lnw_v3/BUILD.bazel b/switchapi/es2k/lnw_v3/BUILD.bazel
@@ -7,6 +7,21 @@ load("//bazel:rules.bzl", "krnlmon_cc_library")
 
 package(default_visibility = ["//visibility:public"])
 
+krnlmon_cc_library(
+    name = "lnw_ecmp_hash_table",
+    hdrs = ["lnw_ecmp_hash_table.h"],
+)
+
+krnlmon_cc_library(
+    name = "lnw_ecmp_nexthop_table",
+    hdrs = ["lnw_ecmp_nexthop_table.h"],
+)
+
+krnlmon_cc_library(
+    name = "lnw_nexthop_table",
+    hdrs = ["lnw_nexthop_table.h"],
+)
+
 krnlmon_cc_library(
     name = "switch_pd_lag_hdr",
     hdrs = ["switch_pd_lag.h"],
@@ -22,20 +37,19 @@ krnlmon_cc_library(
         "//switchapi:switch_internal",
         "//switchapi:switch_lag",
         "//switchapi/es2k:switch_pd_p4_name_mapping",
+        "//switchapi/es2k:switch_pd_p4_name_routing",
         "//switchapi/es2k:switch_pd_utils",
         "@local_es2k_bin//:sde_hdrs",
     ],
 )
 
-krnlmon_cc_library(
-    name = "switch_pd_p4_name_routing",
-    hdrs = ["switch_pd_p4_name_routing.h"],
-)
-
 krnlmon_cc_library(
     name = "switch_pd_routing",
     srcs = ["switch_pd_routing.c"],
     deps = [
+        ":lnw_ecmp_hash_table",
+        ":lnw_ecmp_nexthop_table",
+        ":lnw_nexthop_table",
         "//switchapi:switch_base_types",
         "//switchapi:switch_handle",
         "//switchapi:switch_l3",