Make chrome_shell_apk build

build/config/android/internal_rules.gni

Index: build/config/android/internal_rules.gni
diff --git a/build/config/android/internal_rules.gni b/build/config/android/internal_rules.gni
index ad979025df1dab92ac2d4757a0eb5cc9e6cede58..8dc2062f41051bfc9093e91abb2472436df805f0 100644
--- a/build/config/android/internal_rules.gni
+++ b/build/config/android/internal_rules.gni
@@ -85,11 +85,6 @@ template("write_build_config") {
       deps += invoker.deps
     }
 
-    outputs = [
-      depfile,
-      build_config
-    ]
-
     possible_deps_configs = []
     foreach(d, deps) {
       dep_gen_dir = get_label_info(d, "target_gen_dir")
@@ -98,6 +93,11 @@ template("write_build_config") {
     }
     rebase_possible_deps_configs = rebase_path(possible_deps_configs)
 
+    outputs = [
+      depfile,
+      build_config
+    ]
+
     args = [
       "--type", type,
       "--depfile", rebase_path(depfile, root_build_dir),
@@ -565,6 +565,15 @@ template("android_java_library") {
   if (defined(invoker.java_files)) {
     _java_files = invoker.java_files
   } else if (defined(invoker.DEPRECATED_java_in_dir)) {
+    _src_dir = invoker.DEPRECATED_java_in_dir + "/src"
+    _src_dir_exists = exec_script("//build/dir_exists.py",
+          [ rebase_path(_src_dir, root_build_dir) ],
+          "string")
+    assert(_src_dir_exists == "False",
+        "In GN, java_in_dir should be the fully specified java directory " +
+        "(i.e. including the trailing \"/src\")")
+
+

[brettw, 2014/10/09 17:05:31]

Nit: two blank lines.

[cjhopman, 2014/10/10 01:10:08]

Done.

     _java_files_build_rel = exec_script(
         "//build/android/gyp/find.py",
         [
@@ -718,10 +727,9 @@ template("copy_ex") {
 
   action(target_name) {
     script = "//build/android/gyp/copy_ex.py"
-    depfile = "$target_gen_dir/$target_name.d"
-    outputs = [
-      depfile,
-    ]
+
+    if (defined(invoker.deps)) { deps = invoker.deps }
+
     sources = []
     if (defined(invoker.sources)) {
       sources += invoker.sources
@@ -732,18 +740,24 @@ template("copy_ex") {
       inputs += invoker.inputs
     }
 
+    depfile = "$target_gen_dir/$target_name.d"
+    outputs = [
+      depfile,
+    ]
+
     args = [
       "--depfile", rebase_path(depfile, root_build_dir),
       "--dest", rebase_path(invoker.dest, root_build_dir),
     ]
-    if (defined(invoker.args)) {
-      args += invoker.args
-    }
     rebased_sources = rebase_path(sources, root_build_dir)
     args += [ "--files=$rebased_sources" ]
 
     if (defined(invoker.clear_dir) && invoker.clear_dir) {
       args += ["--clear"]
     }
+
+    if (defined(invoker.args)) {
+      args += invoker.args
+    }
   }
 }