Automated rollback of commit f35866577cb8d27a51b31f49f472e926c4359e1f

PiperOrigin-RevId: 209443205

5 files changed, 189 insertions, 254 deletions

diff --git a/third_party/flatbuffers/BUILD b/third_party/flatbuffers/BUILD
index 82bab3ffd9..fbdf19f205 100644
--- a/third_party/flatbuffers/BUILD
+++ b/third_party/flatbuffers/BUILD
@@ -1 +1,15 @@
-# This empty BUILD file is required to make Bazel treat this directory as a package.
+package(default_visibility = ["//visibility:public"])
+
+licenses(["notice"])  # Apache 2.0
+
+filegroup(
+    name = "all_files",
+    srcs = glob(
+        ["**/*"],
+        exclude = [
+            "**/METADATA",
+            "**/OWNERS",
+        ],
+    ),
+    visibility = ["//tensorflow:__subpackages__"],
+)
diff --git a/third_party/flatbuffers/BUILD.system b/third_party/flatbuffers/BUILD.system
deleted file mode 100644
index 14fceada82..0000000000
--- a/third_party/flatbuffers/BUILD.system
+++ /dev/null
@@ -1,38 +0,0 @@
-licenses(["notice"])  # Apache 2.0
-
-filegroup(
-    name = "LICENSE.txt",
-    visibility = ["//visibility:public"],
-)
-
-# Public flatc library to compile flatbuffer files at runtime.
-cc_library(
-    name = "flatbuffers",
-    linkopts = ["-lflatbuffers"],
-    visibility = ["//visibility:public"],
-)
-
-# Public flatc compiler library.
-cc_library(
-    name = "flatc_library",
-    linkopts = ["-lflatbuffers"],
-    visibility = ["//visibility:public"],
-)
-
-genrule(
-    name = "lnflatc",
-    outs = ["flatc.bin"],
-    cmd = "ln -s $$(which flatc) $@",
-)
-
-# Public flatc compiler.
-sh_binary(
-    name = "flatc",
-    srcs = ["flatc.bin"],
-    visibility = ["//visibility:public"],
-)
-
-cc_library(
-    name = "runtime_cc",
-    visibility = ["//visibility:public"],
-)
diff --git a/third_party/flatbuffers/build_defs.bzl b/third_party/flatbuffers/build_defs.bzl
index ba763f3360..ae8d7feebe 100644
--- a/third_party/flatbuffers/build_defs.bzl
+++ b/third_party/flatbuffers/build_defs.bzl
@@ -8,50 +8,66 @@ DEFAULT_FLATC_ARGS = [
     "--gen-object-api",
 ]
 
-def flatbuffer_library_public(
-        name,
-        srcs,
-        outs,
-        language_flag,
-        out_prefix = "",
-        includes = [],
-        include_paths = [],
-        flatc_args = DEFAULT_FLATC_ARGS,
-        reflection_name = "",
-        reflection_visiblity = None,
-        output_to_bindir = False):
-    """Generates code files for reading/writing the given flatbuffers in the requested language using the public compiler.
-
-    Outs:
-      filegroup(name): all generated source files.
-      Fileset([reflection_name]): (Optional) all generated reflection binaries.
-
-    Args:
-      name: Rule name.
-      srcs: Source .fbs files. Sent in order to the compiler.
-      outs: Output files from flatc.
-      language_flag: Target language flag. One of [-c, -j, -js].
-      out_prefix: Prepend this path to the front of all generated files except on
-          single source targets. Usually is a directory name.
-      includes: Optional, list of filegroups of schemas that the srcs depend on.
-      include_paths: Optional, list of paths the includes files can be found in.
-      flatc_args: Optional, list of additional arguments to pass to flatc.
-      reflection_name: Optional, if set this will generate the flatbuffer
-        reflection binaries for the schemas.
-      reflection_visiblity: The visibility of the generated reflection Fileset.
-      output_to_bindir: Passed to genrule for output to bin directory.
-    """
-    include_paths_cmd = ["-I %s" % (s) for s in include_paths]
-
-    # '$(@D)' when given a single source target will give the appropriate
-    # directory. Appending 'out_prefix' is only necessary when given a build
-    # target with multiple sources.
-    output_directory = (
-        ("-o $(@D)/%s" % (out_prefix)) if len(srcs) > 1 else ("-o $(@D)")
-    )
-    genrule_cmd = " ".join([
+def flatbuffer_library_public(name,
+                              srcs,
+                              outs,
+                              language_flag,
+                              out_prefix="",
+                              includes=[],
+                              include_paths=[],
+                              flatc_args=DEFAULT_FLATC_ARGS,
+                              reflection_name="",
+                              reflection_visiblity=None,
+                              output_to_bindir=False):
+  '''Generates code files for reading/writing the given flatbuffers in the requested language using the public compiler.
+
+  Args:
+    name: Rule name.
+    srcs: Source .fbs files. Sent in order to the compiler.
+    outs: Output files from flatc.
+    language_flag: Target language flag. One of [-c, -j, -js].
+    out_prefix: Prepend this path to the front of all generated files except on
+        single source targets. Usually is a directory name.
+    includes: Optional, list of filegroups of schemas that the srcs depend on.
+    include_paths: Optional, list of paths the includes files can be found in.
+    flatc_args: Optional, list of additional arguments to pass to flatc.
+    reflection_name: Optional, if set this will generate the flatbuffer
+      reflection binaries for the schemas.
+    reflection_visiblity: The visibility of the generated reflection Fileset.
+    output_to_bindir: Passed to genrule for output to bin directory.
+  Outs:
+    filegroup(name): all generated source files.
+    Fileset([reflection_name]): (Optional) all generated reflection binaries.
+  '''
+  include_paths_cmd = ["-I %s" % (s) for s in include_paths]
+  # '$(@D)' when given a single source target will give the appropriate
+  # directory. Appending 'out_prefix' is only necessary when given a build
+  # target with multiple sources.
+  output_directory = (
+      ("-o $(@D)/%s" % (out_prefix)) if len(srcs) > 1 else ("-o $(@D)"))
+  genrule_cmd = " ".join([
+      "for f in $(SRCS); do",
+      "$(location %s)" % (flatc_path),
+      " ".join(flatc_args),
+      " ".join(include_paths_cmd),
+      language_flag,
+      output_directory,
+      "$$f;",
+      "done",
+  ])
+  native.genrule(
+      name=name,
+      srcs=srcs,
+      outs=outs,
+      output_to_bindir=output_to_bindir,
+      tools=includes + [flatc_path,],
+      cmd=genrule_cmd,
+      message="Generating flatbuffer files for %s:" % (name),)
+  if reflection_name:
+    reflection_genrule_cmd = " ".join([
         "for f in $(SRCS); do",
         "$(location %s)" % (flatc_path),
+        "-b --schema",
         " ".join(flatc_args),
         " ".join(include_paths_cmd),
         language_flag,
@@ -59,157 +75,122 @@ def flatbuffer_library_public(
         "$$f;",
         "done",
     ])
-    native.genrule(
-        name = name,
-        srcs = srcs,
-        outs = outs,
-        output_to_bindir = output_to_bindir,
-        tools = includes + [flatc_path],
-        cmd = genrule_cmd,
-        message = "Generating flatbuffer files for %s:" % (name),
-    )
-    if reflection_name:
-        reflection_genrule_cmd = " ".join([
-            "for f in $(SRCS); do",
-            "$(location %s)" % (flatc_path),
-            "-b --schema",
-            " ".join(flatc_args),
-            " ".join(include_paths_cmd),
-            language_flag,
-            output_directory,
-            "$$f;",
-            "done",
-        ])
-        reflection_outs = [
-            (out_prefix + "%s.bfbs") % (s.replace(".fbs", "").split("/")[-1])
-            for s in srcs
-        ]
-        native.genrule(
-            name = "%s_srcs" % reflection_name,
-            srcs = srcs,
-            outs = reflection_outs,
-            output_to_bindir = output_to_bindir,
-            tools = includes + [flatc_path],
-            cmd = reflection_genrule_cmd,
-            message = "Generating flatbuffer reflection binary for %s:" % (name),
-        )
-        native.Fileset(
-            name = reflection_name,
-            out = "%s_out" % reflection_name,
-            entries = [
-                native.FilesetEntry(files = reflection_outs),
-            ],
-            visibility = reflection_visiblity,
-        )
-
-def flatbuffer_cc_library(
-        name,
-        srcs,
-        srcs_filegroup_name = "",
-        out_prefix = "",
-        includes = [],
-        include_paths = [],
-        flatc_args = DEFAULT_FLATC_ARGS,
-        visibility = None,
-        srcs_filegroup_visibility = None,
-        gen_reflections = False):
-    '''A cc_library with the generated reader/writers for the given flatbuffer definitions.
-
-    Outs:
-      filegroup([name]_srcs): all generated .h files.
-      filegroup(srcs_filegroup_name if specified, or [name]_includes if not):
-          Other flatbuffer_cc_library's can pass this in for their `includes`
-          parameter, if they depend on the schemas in this library.
-      Fileset([name]_reflection): (Optional) all generated reflection binaries.
-      cc_library([name]): library with sources and flatbuffers deps.
-
-    Remarks:
-      ** Because the genrule used to call flatc does not have any trivial way of
-        computing the output list of files transitively generated by includes and
-        --gen-includes (the default) being defined for flatc, the --gen-includes
-        flag will not work as expected. The way around this is to add a dependency
-        to the flatbuffer_cc_library defined alongside the flatc included Fileset.
-        For example you might define:
-
-        flatbuffer_cc_library(
-            name = "my_fbs",
-            srcs = [ "schemas/foo.fbs" ],
-            includes = [ "//third_party/bazz:bazz_fbs_includes" ],
-        )
-
-        In which foo.fbs includes a few files from the Fileset defined at
-        //third_party/bazz:bazz_fbs_includes. When compiling the library that
-        includes foo_generated.h, and therefore has my_fbs as a dependency, it
-        will fail to find any of the bazz *_generated.h files unless you also
-        add bazz's flatbuffer_cc_library to your own dependency list, e.g.:
-
-        cc_library(
-            name = "my_lib",
-            deps = [
-                ":my_fbs",
-                "//third_party/bazz:bazz_fbs"
-            ],
-        )
-
-        Happy dependent Flatbuffering!
-
-    Args:
-      name: Rule name.
-      srcs: Source .fbs files. Sent in order to the compiler.
-      srcs_filegroup_name: Name of the output filegroup that holds srcs. Pass this
-          filegroup into the `includes` parameter of any other
-          flatbuffer_cc_library that depends on this one's schemas.
-      out_prefix: Prepend this path to the front of all generated files. Usually
-          is a directory name.
-      includes: Optional, list of filegroups of schemas that the srcs depend on.
-          ** SEE REMARKS BELOW **
-      include_paths: Optional, list of paths the includes files can be found in.
-      flatc_args: Optional list of additional arguments to pass to flatc
-          (e.g. --gen-mutable).
-      visibility: The visibility of the generated cc_library. By default, use the
-          default visibility of the project.
-      srcs_filegroup_visibility: The visibility of the generated srcs filegroup.
-          By default, use the value of the visibility parameter above.
-      gen_reflections: Optional, if true this will generate the flatbuffer
-        reflection binaries for the schemas.
-    '''
-    output_headers = [
-        (out_prefix + "%s_generated.h") % (s.replace(".fbs", "").split("/")[-1])
-        for s in srcs
+    reflection_outs = [
+        (out_prefix + "%s.bfbs") % (s.replace(".fbs", "").split("/")[-1]) for s in srcs
     ]
-    reflection_name = "%s_reflection" % name if gen_reflections else ""
-
-    flatbuffer_library_public(
-        name = "%s_srcs" % (name),
-        srcs = srcs,
-        outs = output_headers,
-        language_flag = "-c",
-        out_prefix = out_prefix,
-        includes = includes,
-        include_paths = include_paths,
-        flatc_args = flatc_args,
-        reflection_name = reflection_name,
-        reflection_visiblity = visibility,
-    )
-    native.cc_library(
-        name = name,
-        hdrs = output_headers,
-        srcs = output_headers,
-        features = [
-            "-parse_headers",
-        ],
-        deps = [
-            "@flatbuffers//:runtime_cc",
+    native.genrule(
+        name= "%s_srcs" % reflection_name,
+        srcs=srcs,
+        outs=reflection_outs,
+        output_to_bindir=output_to_bindir,
+        tools=includes + [flatc_path,],
+        cmd=reflection_genrule_cmd,
+        message="Generating flatbuffer reflection binary for %s:" % (name),)
+    native.Fileset(
+        name=reflection_name,
+        out="%s_out" % reflection_name,
+        entries=[
+            native.FilesetEntry(files=reflection_outs),
         ],
-        includes = ["."],
-        linkstatic = 1,
-        visibility = visibility,
+        visibility=reflection_visiblity
     )
 
-    # A filegroup for the `srcs`. That is, all the schema files for this
-    # Flatbuffer set.
-    native.filegroup(
-        name = srcs_filegroup_name if srcs_filegroup_name else "%s_includes" % (name),
-        srcs = srcs,
-        visibility = srcs_filegroup_visibility if srcs_filegroup_visibility != None else visibility,
-    )
+
+def flatbuffer_cc_library(name, srcs, srcs_filegroup_name="",
+                          out_prefix="", includes=[], include_paths=[],
+                          flatc_args=DEFAULT_FLATC_ARGS,
+                          visibility=None, srcs_filegroup_visibility=None,
+                          gen_reflections=False):
+  '''A cc_library with the generated reader/writers for the given flatbuffer definitions.
+
+  Args:
+    name: Rule name.
+    srcs: Source .fbs files. Sent in order to the compiler.
+    srcs_filegroup_name: Name of the output filegroup that holds srcs. Pass this
+        filegroup into the `includes` parameter of any other
+        flatbuffer_cc_library that depends on this one's schemas.
+    out_prefix: Prepend this path to the front of all generated files. Usually
+        is a directory name.
+    includes: Optional, list of filegroups of schemas that the srcs depend on.
+        ** SEE REMARKS BELOW **
+    include_paths: Optional, list of paths the includes files can be found in.
+    flatc_args: Optional list of additional arguments to pass to flatc
+        (e.g. --gen-mutable).
+    visibility: The visibility of the generated cc_library. By default, use the
+        default visibility of the project.
+    srcs_filegroup_visibility: The visibility of the generated srcs filegroup.
+        By default, use the value of the visibility parameter above.
+    gen_reflections: Optional, if true this will generate the flatbuffer
+      reflection binaries for the schemas.
+  Outs:
+    filegroup([name]_srcs): all generated .h files.
+    filegroup(srcs_filegroup_name if specified, or [name]_includes if not):
+        Other flatbuffer_cc_library's can pass this in for their `includes`
+        parameter, if they depend on the schemas in this library.
+    Fileset([name]_reflection): (Optional) all generated reflection binaries.
+    cc_library([name]): library with sources and flatbuffers deps.
+
+  Remarks:
+    ** Because the genrule used to call flatc does not have any trivial way of
+      computing the output list of files transitively generated by includes and
+      --gen-includes (the default) being defined for flatc, the --gen-includes
+      flag will not work as expected. The way around this is to add a dependency
+      to the flatbuffer_cc_library defined alongside the flatc included Fileset.
+      For example you might define:
+
+      flatbuffer_cc_library(
+          name = "my_fbs",
+          srcs = [ "schemas/foo.fbs" ],
+          includes = [ "//third_party/bazz:bazz_fbs_includes" ],
+      )
+
+      In which foo.fbs includes a few files from the Fileset defined at
+      //third_party/bazz:bazz_fbs_includes. When compiling the library that
+      includes foo_generated.h, and therefore has my_fbs as a dependency, it
+      will fail to find any of the bazz *_generated.h files unless you also
+      add bazz's flatbuffer_cc_library to your own dependency list, e.g.:
+
+      cc_library(
+          name = "my_lib",
+          deps = [
+              ":my_fbs",
+              "//third_party/bazz:bazz_fbs"
+          ],
+      )
+
+      Happy dependent Flatbuffering!
+  '''
+  output_headers = [
+      (out_prefix + "%s_generated.h") % (s.replace(".fbs", "").split("/")[-1]) for s in srcs
+  ]
+  reflection_name = "%s_reflection" % name if gen_reflections else ""
+
+  flatbuffer_library_public(name="%s_srcs" % (name),
+                            srcs=srcs,
+                            outs=output_headers,
+                            language_flag="-c",
+                            out_prefix=out_prefix,
+                            includes=includes,
+                            include_paths=include_paths,
+                            flatc_args=flatc_args,
+                            reflection_name=reflection_name,
+                            reflection_visiblity=visibility,)
+  native.cc_library(name=name,
+                    hdrs=output_headers,
+                    srcs=output_headers,
+                    features=[
+                        "-parse_headers",
+                    ],
+                    deps=[
+                        "@flatbuffers//:runtime_cc",
+                    ],
+                    includes=["."],
+                    linkstatic=1,
+                    visibility=visibility)
+
+  # A filegroup for the `srcs`. That is, all the schema files for this
+  # Flatbuffer set.
+  native.filegroup(
+      name = srcs_filegroup_name if srcs_filegroup_name else "%s_includes" % (name),
+      srcs = srcs,
+      visibility=srcs_filegroup_visibility if srcs_filegroup_visibility != None else visibility)
diff --git a/third_party/flatbuffers/BUILD.bazel b/third_party/flatbuffers/flatbuffers.BUILD
index 9d233a30d6..4a3701e893 100644
--- a/third_party/flatbuffers/BUILD.bazel
+++ b/third_party/flatbuffers/flatbuffers.BUILD
@@ -19,10 +19,7 @@ config_setting(
 
 FLATBUFFERS_COPTS = select({
     ":windows": [],
-    "//conditions:default": [
-        "-Wno-implicit-fallthrough",
-        "-fexceptions",
-    ],
+    "//conditions:default": ["-Wno-implicit-fallthrough", "-fexceptions"],
 })
 
 # Public flatc library to compile flatbuffer files at runtime.
diff --git a/third_party/flatbuffers/workspace.bzl b/third_party/flatbuffers/workspace.bzl
deleted file mode 100644
index 3aeef96a72..0000000000
--- a/third_party/flatbuffers/workspace.bzl
+++ /dev/null
@@ -1,19 +0,0 @@
-"""Loads the Flatbuffers library, used by TF Lite."""
-
-load("//third_party:repo.bzl", "third_party_http_archive")
-
-def repo():
-    third_party_http_archive(
-        name = "flatbuffers",
-        strip_prefix = "flatbuffers-1.9.0",
-        sha256 = "5ca5491e4260cacae30f1a5786d109230db3f3a6e5a0eb45d0d0608293d247e3",
-        urls = [
-            "https://mirror.bazel.build/github.com/google/flatbuffers/archive/v1.9.0.tar.gz",
-            "https://github.com/google/flatbuffers/archive/v1.9.0.tar.gz",
-        ],
-        build_file = "//third_party/flatbuffers:BUILD.bazel",
-        system_build_file = "//third_party/flatbuffers:BUILD.system",
-        link_files = {
-            "//third_party/flatbuffers:build_defs.bzl": "build_defs.bzl",
-        },
-    )