Add dexing for libraries and apks

build/config/android/internal_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("//build/config/android/config.gni")
 
 assert(is_android)
 
 
 rebased_android_sdk = rebase_path(android_sdk, root_build_dir)
@@ skipping 44 matching lines @@
     args = [
       "--type", type,
       "--depfile", rebase_path(depfile, root_build_dir),
       "--possible-deps-configs=$rebase_possible_deps_configs",
       "--build-config", rebase_path(build_config, root_build_dir),
     ]
 
     if (type == "android_library" || type == "android_apk") {
       args += [
         "--jar-path", rebase_path(invoker.jar_path, root_build_dir),
+        "--dex-path", rebase_path(invoker.dex_path, root_build_dir),
       ]
     }
 
     if (type == "android_resources" || type == "android_apk") {
       assert(defined(invoker.resources_zip))
       args += [
         "--resources-zip", rebase_path(invoker.resources_zip, root_build_dir),
       ]
     }
 
@@ skipping 28 matching lines @@
       "--output=$rebase_output",
     ]
     if (defined(invoker.base_dir)) {
       args += [
         "--base-dir", rebase_path(invoker.base_dir, root_build_dir)
       ]
     }
   }
 }
 
+template("dex") {
+  assert(defined(invoker.sources))
+  assert(defined(invoker.output))
+  action(target_name) {
+    script = "//build/android/gyp/dex.py"
+    depfile = "$target_gen_dir/$target_name.d"
+    sources = invoker.sources
+    outputs = [depfile, invoker.output]
+    if (defined(invoker.inputs)) {
+      inputs = invoker.inputs
+    }
+
+    rebase_output = rebase_path(invoker.output, root_build_dir)

[newt (away), 2014/07/18 21:19:18]

s/rebase/rebased

[cjhopman, 2014/07/28 21:58:52]

Done.

+
+    args = [
+      "--depfile", rebase_path(depfile, root_build_dir),
+      "--android-sdk-tools", rebased_android_sdk_build_tools,
+      "--dex-path", rebase_output,
+    ]
+
+    if (defined(invoker.no_locals) && invoker.no_locals) {
+      args += [
+        "--no-locals=1"
+      ]
+    }
+
+    if (defined(invoker.args)) {
+      args += invoker.args
+    }
+
+    args += rebase_path(invoker.sources, root_build_dir)
+  }
+}
+
 # Compiles and jars a set of java files.
 #
 # Outputs:
 #  $jar_path.jar
 #  $jar_path.jar.TOC
 #
 # Variables
 #   java_files: List of .java files to compile.
 #   java_deps: List of java dependencies. These should all have a .jar output
 #     at "${target_gen_dir}/${target_name}.jar.
@@ skipping 100 matching lines @@
 
 
 # This adds Android-specific parts to the java_library template.
 #
 # Runs Android lint against the compiled java files.
 # Dexes the output jar for inclusion in an APK.
 template("android_java_library") {
   assert(defined(invoker.java_files))
   assert(defined(invoker.build_config))
   assert(defined(invoker.jar_path))
+  assert(defined(invoker.dex_path))
 
   jar_path = invoker.jar_path
+  dex_path = invoker.dex_path
 
   java_library("${target_name}__java_library") {
     if (defined(invoker.jar_excluded_patterns)) {
       jar_excluded_patterns = invoker.jar_excluded_patterns
     }
     build_config = invoker.build_config
     java_files = invoker.java_files
 
     if (defined(invoker.srcjar_deps)) {
       srcjar_deps = invoker.srcjar_deps
     }
   }
 
   # TODO(cjhopman): lint
-  # TODO(cjhopman): dex
+
+
+  dex("${target_name}__dex") {

[newt (away), 2014/07/18 21:19:18]

I didn't realize we generated a dex file for each library. What's the advantage
of that vs just dexing up all the library jars once we get to the APK step?

[cjhopman, 2014/07/28 21:58:52]

Dexing is slow. Doing it this way makes it so that we only dex each library once
(instead of once per apk) and allows us to do the dexing of the library as soon
as possible (instead of waiting until the apk is ready to be built).

+    sources = [jar_path]
+    output = dex_path
+  }
 
   group(target_name) {
     deps = [
-      ":${target_name}__java_library"
+      ":${target_name}__java_library",
+      ":${target_name}__dex",
     ]
   }
 }
 
 
 # Runs process_resources.py
 template("process_resources") {
   zip_path = invoker.zip_path
   srcjar_path = invoker.srcjar_path
   build_config = invoker.build_config
@@ skipping 62 matching lines @@
       args += [
         "--all-resources-zip-out", rebase_path(all_resources_zip, root_build_dir)
       ]
     }
 
     if (defined(invoker.args)) {
       args += invoker.args
     }
   }
 }