Update ~all flatbuffer rules to static_flatbuffer rules
Don't update things that use unions or circular dependencies.
Used buildozer to make most changes; didn't document the precise steps,
but the approximate steps were:
* Alter the load statements to use the new rule.
* Make all flatbuffer_cc_library rules:
* No longer specify gen_reflections.
* Move all includes attributes to use deps (including stripping the
_includes prefix off of the items in the includes list).
* Rename all flatbuffer_cc_library rules to static_flatbuffer rules.
* Manually fix the spyglass flatbuffer_py_library target that depended
directly on some outputs of the flatbuffer_cc_library macro.
* Manually undo anything that can't build with the new rules (should
just be the json_to_flatbuffer target, web_proxy_fbs, and one of the
flatbuffers used to test the static flatbuffers codegen itself).
* Run the cleanup to get rid of unused load statements.
Change-Id: Ie37a13585228847b19177dc86a9aa603ad90e890
Signed-off-by: James Kuszmaul <james.kuszmaul@bluerivertech.com>
diff --git a/y2020/vision/sift/BUILD b/y2020/vision/sift/BUILD
index 1920cce..1d4083e 100644
--- a/y2020/vision/sift/BUILD
+++ b/y2020/vision/sift/BUILD
@@ -1,5 +1,6 @@
+load("//aos/flatbuffers:generate.bzl", "static_flatbuffer")
load(":fast_gaussian.bzl", "fast_gaussian")
-load("@com_github_google_flatbuffers//:build_defs.bzl", "flatbuffer_cc_library", "flatbuffer_py_library")
+load("@com_github_google_flatbuffers//:build_defs.bzl", "flatbuffer_py_library")
load("@com_github_google_flatbuffers//:typescript.bzl", "flatbuffer_ts_library")
# Note that this file is also used directly by :fast_gaussian_halide_generator,
@@ -229,10 +230,9 @@
visibility = ["//visibility:public"],
)
-flatbuffer_cc_library(
+static_flatbuffer(
name = "sift_fbs",
srcs = ["sift.fbs"],
- gen_reflections = True,
target_compatible_with = ["@platforms//os:linux"],
visibility = ["//visibility:public"],
)
@@ -244,13 +244,12 @@
visibility = ["//y2020:__subpackages__"],
)
-flatbuffer_cc_library(
+static_flatbuffer(
name = "sift_training_fbs",
srcs = ["sift_training.fbs"],
- gen_reflections = True,
- includes = [":sift_fbs_includes"],
target_compatible_with = ["@platforms//os:linux"],
visibility = ["//visibility:public"],
+ deps = [":sift_fbs"],
)
py_binary(