From 30c32487053d7f7d1c179e46b52d8d18e9a90c18 Mon Sep 17 00:00:00 2001 From: PJ Reiniger Date: Sat, 12 Oct 2024 18:06:52 -0400 Subject: [PATCH] Simplify ntcore --- ntcore/BUILD.bazel | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/ntcore/BUILD.bazel b/ntcore/BUILD.bazel index 0e7cea571dd..1156cff691e 100644 --- a/ntcore/BUILD.bazel +++ b/ntcore/BUILD.bazel @@ -24,17 +24,6 @@ filegroup( visibility = ["//ntcore:__subpackages__"], ) -cc_library( - name = "private_includes", - hdrs = glob([ - "src/main/native/cpp/*.h", - "src/main/native/cpp/net/*.h", - "src/main/native/cpp/net/*.inc", - "src/main/native/cpp/net3/*.h", - ]), - strip_include_prefix = "src/main/native/cpp", -) - cc_library( name = "ntcore.static", srcs = glob( @@ -42,12 +31,14 @@ cc_library( exclude = ["src/main/native/cpp/jni/**"], ) + [":generated_cc_source"], hdrs = glob(["src/main/native/include/**/*"]), - includes = ["src/main/native/include"], + includes = [ + "src/main/native/cpp", + "src/main/native/include", + ], strip_include_prefix = "src/main/native/include", visibility = ["//visibility:public"], deps = [ ":generated_cc_headers", - ":private_includes", "//wpinet:wpinet.static", "//wpiutil:wpiutil.static", ],