Making the AIDL GN target support multiple include directories.

build/config/android/rules.gni

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Do not add any imports to non-//build directories here.
 # Some projects (e.g. V8) do not have non-build directories DEPS'ed in.
 import("//build/config/android/config.gni")
 import("//build/config/android/internal_rules.gni")
 import("//build/config/compiler/compiler.gni")
 import("//build/config/dcheck_always_on.gni")
@@ skipping 2602 matching lines @@
       rebased_imports = rebase_path(imports, root_build_dir)
       args = [
         "--depfile",
         rebase_path(depfile, root_build_dir),
         "--aidl-path",
         rebase_path(aidl_path, root_build_dir),
         "--imports=$rebased_imports",
         "--srcjar",
         rebase_path(srcjar_path, root_build_dir),
       ]
-      if (defined(invoker.import_include) && invoker.import_include != "") {
+      if (defined(invoker.import_include) && invoker.import_include != []) {
         # TODO(cjhopman): aidl supports creating a depfile. We should be able to
         # switch to constructing a depfile for the overall action from that
         # instead of having all the .java files in the include paths as inputs.
-        rebased_import_includes =
-            rebase_path([ invoker.import_include ], root_build_dir)
-        args += [ "--includes=$rebased_import_includes" ]
-
-        _java_files_build_rel =
-            exec_script("//build/android/gyp/find.py",
-                        rebase_path([ invoker.import_include ], root_build_dir),
-                        "list lines")
-        _java_files = rebase_path(_java_files_build_rel, ".", root_build_dir)
-        inputs += _java_files
+        rebased_import_paths = []
+        foreach(import_path, invoker.import_include) {
+          _rebased_import_path = []
+          _rebased_import_path += rebase_path([ import_path ], root_build_dir)
+          rebased_import_paths += _rebased_import_path
+          _java_files_build_rel = []
+          _java_files_build_rel = exec_script("//build/android/gyp/find.py",
+                                              _rebased_import_path,
+                                              "list lines")
+          inputs += rebase_path(_java_files_build_rel, ".", root_build_dir)
+        }
+        args += [ "--includes=$rebased_import_paths" ]
       }
       args += rebase_path(sources, root_build_dir)
     }
   }
 
   # Compile a protocol buffer to java.
   #
   # This generates java files from protocol buffers and creates an Android library
   # containing the classes.
   #
@@ skipping 244 matching lines @@
         # because in practice they seem to contain classes required to be in the
         # classpath.
         deps += _subjar_targets
       }
       if (defined(_res_target_name)) {
         deps += [ ":$_res_target_name" ]
       }
     }
   }
 }