Add android_library template

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.
 
+import("config.gni")
 import("internal_rules.gni")
 
 # Declare a jni target
 #
 # This target generates the native jni bindings for a set of .java files.
 #
 # See base/android/jni_generator/jni_generator.py for more info about the
 # format of generating JNI bindings.
 #
 # Variables
@@ skipping 40 matching lines @@
     if (defined(invoker.jni_generator_jarjar_file)) {
       args += [
         "--jarjar", rebase_path(jni_generator_jarjar_file)
       ]
     }
 
     hard_dep = true
   }
 }
 
+
 # Declare a target for c-preprocessor-generated java files
 #
 # This target generates java files using the host C pre-processor. Each file in
 # sources will be compiled using the C pre-processor. If include_path is
 # specified, it will be passed (with --I) to the pre-processor.
 #
 # This target will create a single .srcjar. Adding this target to a library
 # target's srcjar_deps will make the generated java files be included in that
 # library's final outputs.
 #
 # Variables
 #   sources: list of files to be processed by the C pre-processor. For each
 #     file in sources, there will be one .java file in the final .srcjar. For a
 #     file named FooBar.template, a java file will be created with name
 #     FooBar.java.
 #   source_prereqs: additional compile-time dependencies. Any files
 #     `#include`-ed in the templates should be listed here.
 #   package_name: this will be the subdirectory for each .java file in the .srcjar.
 #
 # Example
-#   java_cpp_template("foo_jni") {
+#   java_cpp_template("foo_generated_enum") {
 #     sources = [
 #       "android/java/templates/Foo.template",
 #     ]
 #     source_prereqs = [
 #       "android/java/templates/native_foo_header.h",
 #     ]
 #
 #     package_name = "org/chromium/base/library_loader"
 #     include_path = "android/java/templates"
 #   }
 template("java_cpp_template") {
   assert(defined(invoker.sources))
   package_name = invoker.package_name + ""
 
   if (defined(invoker.include_path)) {
     include_path = invoker.include_path + ""
   } else {
     include_path = "//"
   }
 
   base_gen_dir = "${root_gen_dir}/java_cpp_template/${target_name}/${package_name}"
   gen_dir = "${base_gen_dir}/${package_name}"
+  gcc_template_output_pattern = "${gen_dir}/{{source_name_part}}.java"
   apply_gcc_outputs = process_file_template(
-      invoker.sources,
-      "${gen_dir}/{{source_name_part}}.java"
+      invoker.sources, gcc_template_output_pattern
       )
 
   action_foreach("${target_name}__apply_gcc") {
     script = "//build/android/gyp/gcc_preprocess.py"
     if (defined(invoker.source_prereqs)) {
       source_prereqs = invoker.source_prereqs + []
     }
 
     sources = invoker.sources
     outputs = [
-      "${gen_dir}/{{source_name_part}}.java"
+      gcc_template_output_pattern
     ]
 
     args = [
       "--include-path", rebase_path(include_path),
       "--output", rebase_path(gen_dir) + "/{{source_name_part}}.java",
       "--template={{source}}",
     ]
   }
 
+  srcjar_path = get_target_gen_path(":${target_name}", ".srcjar")
   _zip("${target_name}__zip_srcjar") {
     inputs = apply_gcc_outputs
-    output = get_target_gen_path(target_name, ".srcjar")
+    output = srcjar_path
     base_dir = base_gen_dir
   }
 
   group(target_name) {
     deps = [
       ":${target_name}__zip_srcjar"
     ]
   }
 }
 
 
+# Declare an Android library target
+#
+# This target creates an Android library containing java code and Android
+# resources.
+#
+# Variables
+#   android_library_deps: list of other Android libraries that this library
+#     depends on.
+#   java_files: List of .java files included in this library.
+#   srcjar_deps: List of srcjar dependencies. The .java files in the srcjars
+#     will be added to java_files and be included in this library.
+#
+# Example
+#   android_library("foo_java") {
+#     java_files = [
+#       "android/org/chromium/foo/Foo.java",
+#       "android/org/chromium/foo/FooInterface.java",
+#       "android/org/chromium/foo/FooService.java",
+#     ]
+#     srcjar_deps = [
+#       ":foo_generated_enum"
+#     ]
+#   }
+template("android_library") {
+  template_name = target_name
+
+  #TODO(cjhopman): resources
+
+  assert(defined(invoker.java_files))
+  if (defined(invoker.android_library_deps)) {
+    android_library_deps = invoker.android_library_deps
+  } else {
+    android_library_deps = []
+  }
+
+  _android_java_library(target_name) {
+    jar_path = get_target_gen_path(":${template_name}", ".jar")
+    java_files = invoker.java_files
+    library_deps = android_library_deps
+
+    if (defined(invoker.srcjar_deps)) {
+      srcjar_deps = invoker.srcjar_deps
+    }
+  }
+}
+