Build fixes and parameter passing for the Clang header generator

PiperOrigin-RevId: 338994867
Change-Id: I40f03738ae38bac4bf217c24bd935d5d3572c1f2

cmake/SapiBuildDefs.cmake

@@ -133,7 +133,7 @@ function(add_sapi_library)
     set(_sapi_embed_name "${_sapi_NAME}")
   endif()
 
-  set(_sapi_isystem "${_sapi_NAME}.isystem}")
+  set(_sapi_isystem "${_sapi_NAME}.isystem")
   list(APPEND _sapi_generator_args
     "--sapi_name=${_sapi_LIBRARY_NAME}"
     "--sapi_out=${_sapi_gen_header}"
@@ -143,7 +143,6 @@ function(add_sapi_library)
     "--sapi_ns=${_sapi_NAMESPACE}"
     "--sapi_isystem=${_sapi_isystem}"
   )
-  list(JOIN _sapi_full_inputs "," _sapi_full_inputs)
   if(SAPI_ENABLE_GENERATOR)
     list(APPEND _sapi_generator_command
       sapi_generator_tool
@@ -152,6 +151,7 @@ function(add_sapi_library)
       ${_sapi_full_inputs}
     )
   else()
+    list(JOIN _sapi_full_inputs "," _sapi_full_inputs)
     list(APPEND _sapi_generator_command
       "${SAPI_PYTHON3_EXECUTABLE}" -B
       "${SAPI_SOURCE_DIR}/sandboxed_api/tools/generator2/sapi_generator.py"

sandboxed_api/tools/clang_generator/types.cc

@@ -31,7 +31,7 @@ bool IsFunctionReferenceType(clang::QualType qual) {
 }  // namespace
 
 void TypeCollector::CollectRelatedTypes(clang::QualType qual) {
-  if (seen_.contains(qual)) {
+  if (seen_.count(qual) > 0) {  // contains() is LLVM_VERSION_MAJOR >= 11
     return;
   }
   seen_.insert(qual);