Add support for prebuilt jars

build/config/android/rules.gni

Index: build/config/android/rules.gni
diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni
index ef9245f9dcd9598d68dd3ed44307543782381d95..1462c27c7211db85d09cc6170da24195da24f866 100644
--- a/build/config/android/rules.gni
+++ b/build/config/android/rules.gni
@@ -402,6 +402,9 @@ template("java_strings_grd") {
 #   chromium_code: If true, extra static analysis warning/errors will be enabled.
 #   jar_excluded_patterns: List of patterns of .class files to exclude from the
 #     final jar.
+#   proguard_preprocess: If true, proguard preprocessing will be run. This can

[newt (away), 2014/08/18 21:08:44]

enable_proguard or proguard_enabled seems like a clearer name. Are you trying to
keep this the same as an existing gyp variable?

[cjhopman, 2014/08/18 21:28:27]

Yeah, I'm just trying to keep the same as the existing gyp variable.

+#     be used to remove unwanted parts of the library.
+#   proguard_confg: Path to the proguard config for preprocessing.

[newt (away), 2014/08/18 21:08:44]

s/confg/config

[cjhopman, 2014/08/18 21:28:26]

Done.

 #
 # Example
 #   android_library("foo_java") {
@@ -448,6 +451,11 @@ template("android_library") {
     java_files = invoker.java_files
     build_config = build_config
 
+    if (defined(invoker.proguard_preprocess) && invoker.proguard_preprocess) {
+      proguard_preprocess = true
+      proguard_config = invoker.proguard_config
+    }
+
     if (defined(invoker.jar_excluded_patterns)) {
       jar_excluded_patterns = invoker.jar_excluded_patterns
     }
@@ -459,6 +467,72 @@ template("android_library") {
 }
 
 
+# Declare an Android library target for a prebuilt jar
+#
+# This target creates an Android library containing java code and Android
+# resources.
+#
+# Variables
+#   deps: Specifies the dependencies of this target. Java targets in this list
+#     will be added to the javac classpath. Android resources in dependencies
+#     will be used when building this library.
+#   jar_path: Path to the prebuilt jar.
+#   proguard_preprocess: If true, proguard preprocessing will be run. This can
+#     be used to remove unwanted parts of the library.
+#   proguard_confg: Path to the proguard config for preprocessing.

[newt (away), 2014/08/18 21:08:44]

s/confg/config

[cjhopman, 2014/08/18 21:28:26]

Done.

+#
+# Example
+#   android_java_library("foo_java") {

[newt (away), 2014/08/18 21:08:44]

update example

[cjhopman, 2014/08/18 21:28:27]

Done.

+#     jar_path = "foo.jar"
+#     deps = [
+#       ":foo_resources",
+#       ":bar_java"
+#     ]
+#   }
+template("android_java_prebuilt") {
+  assert(defined(invoker.jar_path))
+  _base_path = "${target_gen_dir}/$target_name"
+  _jar_path = _base_path + ".jar"
+  _dex_path = _base_path + ".dex.jar"
+  _build_config = _base_path + ".build_config"
+
+  write_build_config("${target_name}__build_config") {
+    type = "android_library"
+
+    deps = []
+    if (defined(invoker.deps)) {
+      deps += invoker.deps
+    }
+    build_config = _build_config
+    jar_path = _jar_path
+    dex_path = _dex_path
+  }
+
+  java_prebuilt("${target_name}__process_jar") {
+    if (defined(invoker.proguard_preprocess) && invoker.proguard_preprocess) {
+      proguard_preprocess = true
+      proguard_config = invoker.proguard_config
+    }
+
+    build_config = _build_config
+    input_jar_path = invoker.jar_path
+    output_jar_path = _jar_path
+  }
+
+  dex("${target_name}__dex") {
+    sources = [_jar_path]
+    output = _dex_path
+  }
+
+  group(target_name) {
+    deps = [
+      ":${target_name}__dex",
+    ]
+  }
+}
+
+
+
 # Declare an Android apk target
 #
 # This target creates an Android APK containing java code, resources, assets,