Allow additional targets to be passed to generate_compdb.py

This is required if this is to replace the codesearch
generate_compilation_database method, as mentioned in
https://crrev.com/c/1114413.

Bug: 396230
Change-Id: I61122bae15bed27463e5b770623fdf8106836aac
Reviewed-on: https://chromium-review.googlesource.com/1124077
Commit-Queue: Owen Rodley <orodley@chromium.org>
Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Cr-Commit-Position: refs/heads/master@{#572413}

tools/clang/pylib/clang/compile_db.py

@@ -84,11 +84,12 @@ def GetNinjaPath():
 
 
 # FIXME: This really should be a build target, rather than generated at runtime.
-def GenerateWithNinja(path):
+def GenerateWithNinja(path, targets=[]):
   """Generates a compile database using ninja.
 
   Args:
     path: The build directory to generate a compile database for.
+    targets: Additional targets to pass to ninja.
 
   Returns:
     List of the contents of the compile database.
@@ -96,9 +97,9 @@ def GenerateWithNinja(path):
   # TODO(dcheng): Ensure that clang is enabled somehow.
 
   # First, generate the compile database.
-  json_compile_db = subprocess.check_output([
-      GetNinjaPath(), '-C', path, '-t', 'compdb', 'cc', 'cxx', 'objc',
-      'objcxx'])
+  json_compile_db = subprocess.check_output(
+      [GetNinjaPath(), '-C', path] + targets +
+      ['-t', 'compdb', 'cc', 'cxx', 'objc', 'objcxx'])
   return json.loads(json_compile_db)
 
 

tools/clang/scripts/generate_compdb.py

@@ -28,11 +28,15 @@ def main(argv):
       '-p',
       required=True,
       help='Path to build directory')
+  parser.add_argument(
+      'targets',
+      nargs='*',
+      help='Additional targets to pass to ninja')
   args = parser.parse_args()
 
   print json.dumps(
       compile_db.ProcessCompileDatabaseIfNeeded(
-          compile_db.GenerateWithNinja(args.p)))
+          compile_db.GenerateWithNinja(args.p, args.targets))
 
 
 if __name__ == '__main__':