Sandboxed API: Pass the api_version to the clang tool

This change introduces a new command-line flag `--sapi_api_version` to the clang tool. The flag defaults to 1, and currently, only API version 1 is supported.

PiperOrigin-RevId: 900753148
Change-Id: If6e6469bf21a78823671707a193b4f4662d0b345

Author: cblichmann

cmake/SapiBuildDefs.cmake

@@ -99,10 +99,6 @@ function(add_sapi_library)
                         "${_sapi_one_value}" "${_sapi_multi_value}")
   set(_sapi_NAME "${ARGV0}")
 
-  if(_sapi_API_VERSION AND NOT _sapi_API_VERSION VERSION_EQUAL "1")
-    message(FATAL_ERROR "API_VERSION \"1\" is the only one defined right now")
-  endif()
-
   if (_sapi_GENERATOR_VERSION AND (_sapi_GENERATOR_VERSION VERSION_LESS "1" OR _sapi_GENERATOR_VERSION VERSION_GREATER "3"))
     message(FATAL_ERROR "GENERATOR_VERSION must be \"1\", \"2\" or \"3\"")
   endif()
@@ -192,7 +188,8 @@ function(add_sapi_library)
     "--sapi_functions=${_sapi_funcs}"
     "--sapi_ns=${_sapi_NAMESPACE}"
   )
-  if(_sapi_use_generator_version VERSION_EQUAL "2" OR _sapi_use_generator_version VERSION_EQUAL "3")
+  if(_sapi_use_generator_version VERSION_GREATER_EQUAL "2")
+    list(APPEND _sapi_generator_args "--sapi_api_version=${_sapi_API_VERSION}")
     if (_sapi_use_generator_version VERSION_EQUAL "3")
       list(APPEND _sapi_generator_args
         "--sapi_sandboxee_src_out=${_sapi_gen_sandboxee_src}"

sandboxed_api/bazel/sapi.bzl

@@ -262,7 +262,6 @@ sapi_interface = rule(
         "limit_scan_depth": attr.bool(default = False),
         "api_version": attr.int(
             default = 1,
-            values = [1],  # Only a single version is defined right now
         ),
         "generator_version": attr.int(
             default = 2,  # Note: always set by sapi_library

sandboxed_api/tools/clang_generator/generator.h

@@ -74,6 +74,7 @@ struct GeneratorOptions {
 
   bool has_sandboxee_src_out() const { return !sandboxee_src_out.empty(); }
 
+  int api_version = 1;
   absl::flat_hash_set<std::string> function_names;
   absl::flat_hash_set<std::string> library_headers;
   absl::flat_hash_set<std::string> in_files;

sandboxed_api/tools/clang_generator/generator_tool.cc

@@ -51,6 +51,13 @@ absl::NoDestructor<llvm::cl::extrahelp> g_extra_help(
     "Report bugs to <https://github.com/google/sandboxed-api/issues>\n");
 
 // Command line options
+absl::NoDestructor<llvm::cl::opt<int>> g_sapi_api_version(
+    "sapi_api_version", llvm::cl::init(1),
+    llvm::cl::desc(
+        "The API version of the Sandboxed API library. Currently only "
+        "version 1 is supported."),
+    llvm::cl::cat(*g_tool_category));
+
 absl::NoDestructor<llvm::cl::opt<std::string>> g_sapi_embed_dir(
     "sapi_embed_dir", llvm::cl::desc("Directory with embedded includes"),
     llvm::cl::cat(*g_tool_category));
@@ -161,6 +168,7 @@ GeneratorOptions GeneratorOptionsFromFlags(
     const std::vector<std::string>& sources) {
   GeneratorOptions options;
   options.work_dir = file_util::fileops::GetCWD();
+  options.api_version = *g_sapi_api_version;
   options.set_function_names(*g_sapi_functions);
   options.set_library_headers(*g_library_headers);
   for (const auto& input : sources) {
@@ -205,6 +213,11 @@ absl::Status GeneratorMain(int argc, char* argv[]) {
 
   auto options = GeneratorOptionsFromFlags(sources);
 
+  if (options.api_version != 1) {
+    return absl::InvalidArgumentError(
+        "Error: Only API version 1 is currently defined.");
+  }
+
   std::unique_ptr<clang::tooling::CompilationDatabase> db =
       FromCxxAjustedCompileCommands(
           NonOwningCompileCommands(opt_parser.getCompilations()));