Bazel: Simplify sapi.bzl and always pass api_version

Follow-up to a previous CMake-only change to pass api_version to Bazel as well.
Also removes generator version checks, as we're always at version >= 2.

PiperOrigin-RevId: 907591256
Change-Id: I09874c5b2523917fbbe546323835326102f27726

Author: cblichmann

sandboxed_api/bazel/sapi.bzl

@@ -53,10 +53,6 @@ def make_exec_label(label):
         executable = True,
     )
 
-# buildifier: disable=function-docstring
-def select_generator(ctx):
-    return ctx.executable._generator_v2
-
 def sort_deps(deps):
     """Sorts a list of dependencies.
 
@@ -151,8 +147,6 @@ def _sapi_interface_impl(ctx):
         fail("generator_version=1 is no longer supported.")
 
     cpp_toolchain = find_cpp_toolchain(ctx)
-    generator = select_generator(ctx)
-    use_clang_generator = ctx.attr.generator_version >= 2
 
     # TODO(szwl): warn if input_files is not set and we didn't find anything
     input_files_paths = []
@@ -166,11 +160,10 @@ def _sapi_interface_impl(ctx):
     append_arg(args, "--sapi_embed_name", ctx.attr.embed_name)
     append_arg(args, "--sapi_functions", ",".join(ctx.attr.functions))
     append_arg(args, "--sapi_ns", ctx.attr.namespace)
+    append_arg(args, "--sapi_api_version", str(ctx.attr.api_version))
+    append_arg(args, "--sapi_sandbox_mode", ctx.attr.sandbox_mode)
 
-    if use_clang_generator:
-        append_arg(args, "--sapi_sandbox_mode", ctx.attr.sandbox_mode)
-
-    if use_clang_generator and ctx.outputs.sandboxee_src_out:
+    if ctx.outputs.sandboxee_src_out:
         append_arg(args, "--sapi_sandboxee_src_out", ctx.outputs.sandboxee_src_out.path)
         outs.append(ctx.outputs.sandboxee_src_out)
 
@@ -204,30 +197,22 @@ def _sapi_interface_impl(ctx):
         # Try to find files automatically
         input_files_paths += _lib_direct_headers(ctx.attr.lib, cc_ctx)
 
-    if use_clang_generator:
-        input_files += cpp_toolchain.all_files.to_list()
-        extra_flags += _clang_generator_flags(ctx, cc_ctx, cpp_toolchain, input_files_paths)
-    else:
-        append_all(extra_flags, "-D", cc_ctx.defines.to_list())
-        append_all(extra_flags, "-isystem", cc_ctx.system_includes.to_list())
-        append_all(extra_flags, "-iquote", cc_ctx.quote_includes.to_list())
-        append_all(extra_flags, "-I", cc_ctx.includes.to_list())
+    input_files += cpp_toolchain.all_files.to_list()
+    extra_flags += _clang_generator_flags(ctx, cc_ctx, cpp_toolchain, input_files_paths)
 
-    if use_clang_generator:
-        args += extra_flags + input_files_paths
-    else:
-        append_arg(args, "--sapi_in", ",".join(input_files_paths))
-        args += ["--"] + extra_flags
+    args += extra_flags + input_files_paths
 
-    progress_msg = ("Generating {} from {} header files." +
-                    "").format(ctx.outputs.out.short_path, len(input_files_paths))
+    progress_msg = "Generating {} from {} header files.".format(
+        ctx.outputs.out.short_path,
+        len(input_files_paths),
+    )
     ctx.actions.run(
         inputs = input_files,
         outputs = outs,
         arguments = args,
         mnemonic = "SapiInterfaceGen",
         progress_message = progress_msg,
-        executable = generator,
+        executable = ctx.executable._generator_v2,
     )
 
 # Build rule that generates SAPI interface.

sandboxed_api/tools/clang_generator/generator_tool.cc

@@ -72,19 +72,6 @@ absl::NoDestructor<llvm::cl::list<std::string>> g_sapi_functions(
                    "empty, generates a SAPI for all functions found."),
     llvm::cl::cat(*g_tool_category));
 
-ABSL_DEPRECATED("Pass the input files directly to the tool.")
-absl::NoDestructor<llvm::cl::list<std::string>> g_sapi_in(
-    "sapi_in", llvm::cl::CommaSeparated,
-    llvm::cl::desc("List of input files to analyze (DEPRECATED)"),
-    llvm::cl::cat(*g_tool_category));
-
-ABSL_DEPRECATED("Ignored for compatibility.")
-absl::NoDestructor<llvm::cl::opt<std::string>> g_sapi_isystem(
-    "sapi_isystem",
-    llvm::cl::desc(
-        "Parameter file with extra system include paths (DEPRECATED)"),
-    llvm::cl::cat(*g_tool_category));
-
 absl::NoDestructor<llvm::cl::opt<bool>> g_sapi_limit_scan_depth(
     "sapi_limit_scan_depth",
     llvm::cl::desc("Whether to only scan for functions "
@@ -204,31 +191,27 @@ absl::Status GeneratorMain(int argc, char* argv[]) {
   OptionsParser& opt_parser = expected_opt_parser.get();
 
   std::vector<std::string> sources = opt_parser.getSourcePathList();
-  for (const auto& sapi_in : *g_sapi_in) {  // NOLINT
-    sources.push_back(sapi_in);
-  }
   if (sources.empty()) {
     return absl::InvalidArgumentError("Error: No input files.");
   }
 
   auto options = GeneratorOptionsFromFlags(sources);
 
-  if (options.api_version != 1) {
+  if (options.api_version < 1) {
     return absl::InvalidArgumentError(
-        "Error: Only API version 1 is currently defined.");
+        "Error: API versions must be 1 or greater.");
+  }
+  if (options.api_version > 1) {
+    absl::FPrintF(
+        stderr,
+        "Warning: API versions greater than 1 are currently experimental.\n");
   }
 
   std::unique_ptr<clang::tooling::CompilationDatabase> db =
       FromCxxAjustedCompileCommands(
           NonOwningCompileCommands(opt_parser.getCompilations()));
   clang::tooling::ClangTool tool(*db, sources);
 
-  if (!g_sapi_isystem->empty()) {  // NOLINT(deprecated)
-    absl::FPrintF(
-        stderr,
-        "Note: Ignoring deprecated command-line option: sapi_isystem\n");
-  }
-
   if (options.symbol_list_gen) {
     SymbolListEmitter emitter;
     if (int result = tool.run(