Create *_managed targets for android_apk()s

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 f627e43699ec53c375921868f619e07dd789f2cf..53330d100c5eea7bc34b4ff37067630aaa4edddb 100644
--- a/build/config/android/rules.gni
+++ b/build/config/android/rules.gni
@@ -1508,10 +1508,10 @@ template("android_apk") {
     native_libs = _native_libs
   }
 
-  final_deps = []
+  _final_deps = []
+  _managed_final_deps = []
 
   process_resources_target = "${_template_name}__process_resources"
-  final_deps += [ ":$process_resources_target" ]
   process_resources(process_resources_target) {
     srcjar_path = "${target_gen_dir}/${target_name}.srcjar"
     r_text_path = "${target_gen_dir}/${target_name}_R.txt"
@@ -1573,7 +1573,6 @@ template("android_apk") {
   }
 
   java_target = "${_template_name}__java"
-  final_deps += [ ":$java_target" ]
   java_library_impl(java_target) {
     supports_android = true
     requires_android = true
@@ -1599,7 +1598,8 @@ template("android_apk") {
 
   if (_dist_jar_path != "") {
     create_dist_target = "${_template_name}__create_dist_jar"
-    final_deps += [ ":$create_dist_target" ]
+    _final_deps += [ ":$create_dist_target" ]
+    _managed_final_deps += [ ":$create_dist_target" ]
 
     # TODO(cjhopman): This is only ever needed to calculate the list of tests to
     # run. See build/android/pylib/instrumentation/test_jar.py. We should be
@@ -1631,7 +1631,6 @@ template("android_apk") {
     }
   }
 
-  final_deps += [ ":$final_dex_target_name" ]
   dex("$final_dex_target_name") {
     deps = [
       ":$build_config_target",
@@ -1707,7 +1706,8 @@ template("android_apk") {
     }
   }
 
-  final_deps += [ ":${_template_name}__create" ]
+  _final_deps += [ ":${_template_name}__create" ]
+  _managed_final_deps += [ ":${_template_name}__create_managed" ]
   create_apk("${_template_name}__create") {
     apk_path = _final_apk_path
     android_manifest = _android_manifest
@@ -1771,7 +1771,8 @@ template("android_apk") {
     }
 
     _apk_rule = "${_template_name}__split_apk_abi_${android_app_abi}"
-    final_deps += [ ":$_apk_rule" ]
+    _final_deps += [ ":$_apk_rule" ]
+    _managed_final_deps += [ ":${_apk_rule}_managed" ]
     create_apk(_apk_rule) {
       _split_paths = process_file_template(
               [ _final_apk_path ],
@@ -1799,7 +1800,13 @@ template("android_apk") {
   }
 
   group(target_name) {
-    deps = final_deps
+    deps = _final_deps
+    if (defined(invoker.data_deps)) {
+      data_deps = invoker.data_deps
+    }
+  }
+  group("${target_name}_managed") {
+    deps = _managed_final_deps
     if (defined(invoker.data_deps)) {
       data_deps = invoker.data_deps
     }

[Dirk Pranke, 2015/08/17 21:14:13]

same comment