Fix GN build errors when splits are enabled.

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("//base/android/linker/config.gni")
 import("//build/config/android/config.gni")
 import("//build/config/android/internal_rules.gni")
 import("//third_party/android_platform/config.gni")
 import("//tools/grit/grit_rule.gni")
 
@@ skipping 1334 matching lines @@
 #       native_lib_path
 #     ]
 #   }
 template("android_apk") {
   set_sources_assignment_filter([])
   if (defined(invoker.testonly)) {
     testonly = invoker.testonly
   }
 
   assert(defined(invoker.final_apk_path) || defined(invoker.apk_name))
-  assert(defined(invoker.android_manifest))
+  assert(defined(invoker.android_manifest) ||
+         defined(invoker.android_manifest_dep))
   gen_dir = "$target_gen_dir/$target_name"
   base_path = "$gen_dir/$target_name"
   _build_config = "$target_gen_dir/$target_name.build_config"
   resources_zip_path = "$base_path.resources.zip"
   _all_resources_zip_path = "$base_path.resources.all.zip"
   jar_path = "$base_path.jar"
   _template_name = target_name
 
   final_dex_path = "$gen_dir/classes.dex"
   final_dex_target_name = "${_template_name}__final_dex"
@@ skipping 81 matching lines @@
         invoker.enable_relocation_packing) {
       _enable_relocation_packing = true
     }
 
     _native_lib_version_name = ""
     if (defined(invoker.native_lib_version_name)) {
       _native_lib_version_name = invoker.native_lib_version_name
     }
   }
 
-  _android_manifest = invoker.android_manifest
+  _android_manifest_deps = []

[brettw, 2015/06/26 19:48:52]

It's not clear to me what this block is doing. Can you put a higher-level
comment here about what this is trying to accomplish?

[agrieve, 2015/06/26 20:43:55]

Done.

+  if (defined(invoker.android_manifest_dep)) {
+    _android_manifest_deps = [ invoker.android_manifest_dep ]
+  }
+  if (defined(invoker.android_manifest)) {
+    _android_manifest = invoker.android_manifest
+  } else {
+    _manifest_out_files = get_target_outputs(_android_manifest_deps[0])
+
+    # Use the last output, since depfile outputs always need to come first.
+    foreach(_file, _manifest_out_files) {
+      _android_manifest = _file
+    }
+  }
+
   _rebased_build_config = rebase_path(_build_config, root_build_dir)
   _create_abi_split =
       defined(invoker.create_abi_split) && invoker.create_abi_split
   _create_density_splits =
       defined(invoker.create_density_splits) && invoker.create_density_splits
 
   # Help GN understand that _create_abi_split is not unused (bug in GN).
   assert(_create_abi_split || true)
 
   build_config_target = "${_template_name}__build_config"
   write_build_config(build_config_target) {
     type = "android_apk"
     dex_path = final_dex_path
     resources_zip = resources_zip_path
     build_config = _build_config
     android_manifest = _android_manifest
 
-    deps = _chromium_linker_dep
+    deps = _chromium_linker_dep + _android_manifest_deps
     if (defined(invoker.deps)) {
       deps += invoker.deps
     }
 
     if (defined(invoker.apk_under_test)) {
       apk_under_test = invoker.apk_under_test
     }
 
     native_libs = _native_libs
   }
 
   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"
     android_manifest = _android_manifest
     resource_dirs = [ "//build/android/ant/empty/res" ]
     zip_path = resources_zip_path
     all_resources_zip_path = _all_resources_zip_path
     generate_constant_ids = true
 
     if (defined(invoker.include_all_resources)) {
       include_all_resources = invoker.include_all_resources
     }
 
     build_config = _build_config
-    deps = [
-      ":$build_config_target",
-    ]
+    deps = _android_manifest_deps + [ ":$build_config_target" ]
     if (defined(invoker.deps)) {
       deps += invoker.deps
     }
   }
   _srcjar_deps += [ ":$process_resources_target" ]
 
   if (_native_libs != []) {
     _enable_chromium_linker_tests = false
     if (defined(invoker.enable_chromium_linker_tests)) {
       _enable_chromium_linker_tests = invoker.enable_chromium_linker_tests
@@ skipping 28 matching lines @@
     }
     _srcjar_deps += [ ":${_template_name}__native_libraries_java" ]
   }
 
   java_target = "${_template_name}__java"
   final_deps += [ ":$java_target" ]
   java_library_impl(java_target) {
     supports_android = true
     requires_android = true
     override_build_config = _build_config
-    deps = [
-      ":$build_config_target",
-    ]
+    deps = _android_manifest_deps + [ ":$build_config_target" ]
 
     android_manifest = _android_manifest
     chromium_code = true
     if (defined(invoker.java_files)) {
       java_files = invoker.java_files
     } else if (defined(invoker.DEPRECATED_java_in_dir)) {
       DEPRECATED_java_in_dir = invoker.DEPRECATED_java_in_dir
     } else {
       java_files = []
     }
@@ skipping 136 matching lines @@
     }
 
     version_code = _version_code
     version_name = _version_name
 
     keystore_name = _keystore_name
     keystore_path = _keystore_path
     keystore_password = _keystore_password
 
     # This target generates the input file _all_resources_zip_path.
-    deps = [
-      ":$process_resources_target",
-      ":$final_dex_target_name",
-    ]
+    deps = _android_manifest_deps + [
+             ":$process_resources_target",
+             ":$final_dex_target_name",
+           ]
     if (defined(invoker.deps)) {
       deps += invoker.deps
     }
 
     if (defined(invoker.asset_location)) {
       asset_location = invoker.asset_location
 
       # We don't know the exact dependencies that create the assets in
       # |asset_location|; we depend on all caller deps until a better solution
       # is figured out (http://crbug.com/433330).
       if (defined(invoker.deps)) {
         deps += invoker.deps
       }
     }
 
     if (_native_libs != [] && !_create_abi_split) {
       native_libs_dir = _native_libs_dir
       deps += [ ":${_template_name}__prepare_native" ]
     }
   }
 
   if (_native_libs != [] && _create_abi_split) {
     _manifest_rule = "${_template_name}__split_manifest_abi_${android_app_abi}"
     generate_split_manifest(_manifest_rule) {
       main_manifest = _android_manifest
       out_manifest =
           "$gen_dir/split-manifests/${android_app_abi}/AndroidManifest.xml"
       split_name = "abi_${android_app_abi}"
+      deps = _android_manifest_deps
     }
 
     _apk_rule = "${_template_name}__split_apk_abi_${android_app_abi}"
     final_deps += [ ":$_apk_rule" ]
     create_apk(_apk_rule) {
       _split_paths = process_file_template(
               [ _final_apk_path ],
               "{{source_dir}}/{{source_name_part}}-abi-${android_app_abi}.apk")
       apk_path = _split_paths[0]
       base_path = "$gen_dir/$_apk_rule"
 
       manifest_outputs = get_target_outputs(":${_manifest_rule}")
       android_manifest = manifest_outputs[1]
       load_library_from_apk = _load_library_from_apk
 
       version_code = _version_code
       version_name = _version_name
 
       keystore_name = _keystore_name
       keystore_path = _keystore_path
       keystore_password = _keystore_password
 
       native_libs_dir = _native_libs_dir
       deps = [
         ":${_template_name}__prepare_native",
+        ":${_manifest_rule}",
       ]
     }
   }
 
   group(target_name) {
     deps = final_deps
     if (defined(invoker.data_deps)) {
       data_deps = invoker.data_deps
     }
   }
@@ skipping 425 matching lines @@
 template("uiautomator_test") {
   set_sources_assignment_filter([])
   if (defined(invoker.testonly)) {
     testonly = invoker.testonly
   }
   assert(target_name != "")
   assert(invoker.deps != [] || true)
   group(target_name) {
   }
 }