Revert of GN(Android): Stop specifying depfile under outputs

chrome/android/BUILD.gn

 # 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")
 import("//build/config/android/rules.gni")
 import("//build_overrides/v8.gni")
 import("//chrome/android/chrome_public_apk_tmpl.gni")
 import("//chrome/common/features.gni")
 import("//chrome/version.gni")
 import("//testing/test.gni")
 import("//third_party/icu/config.gni")
 import("//third_party/protobuf/proto_library.gni")
 import("channel.gni")
 import("java_sources.gni")
 
 manifest_package = "org.chromium.chrome"
 
 chrome_public_jinja_variables = default_chrome_public_jinja_variables +
                                 [ "manifest_package=$manifest_package" ]
-chrome_public_android_manifest =
-    "$target_gen_dir/chrome_public_apk/AndroidManifest.xml"
-chrome_sync_shell_android_manifest =
-    "$target_gen_dir/chrome_sync_shell_apk/AndroidManifest.xml"
 
 chrome_sync_shell_jinja_variables =
     default_chrome_public_jinja_variables +
     [ "manifest_package=org.chromium.chrome.sync_shell" ]
 
-jinja_template("chrome_public_android_manifest") {
+jinja_template("chrome_public_apk_manifest") {
   input = "java/AndroidManifest.xml"
-  output = chrome_public_android_manifest
+  output = "$root_gen_dir/chrome_public_apk_manifest/AndroidManifest.xml"
   variables = chrome_public_jinja_variables
   variables += [
     "min_sdk_version=16",
     "target_sdk_version=23",
   ]
 }
 
-jinja_template("chrome_sync_shell_android_manifest") {
+jinja_template("chrome_sync_shell_apk_manifest") {
   input = "java/AndroidManifest.xml"
-  output = chrome_sync_shell_android_manifest
+  output = "$root_gen_dir/chrome_sync_shell_apk_manifest/AndroidManifest.xml"
   variables = chrome_sync_shell_jinja_variables
   variables += [
     "min_sdk_version=16",
     "target_sdk_version=22",
   ]
 }
 
 locale_pak_resources("chrome_locale_paks") {
   sources = [
     "$root_out_dir/locales/am.pak",
@@ skipping 114 matching lines @@
     "values-tr/android_chrome_strings.xml",
     "values-uk/android_chrome_strings.xml",
     "values-vi/android_chrome_strings.xml",
     "values-zh-rCN/android_chrome_strings.xml",
     "values-zh-rTW/android_chrome_strings.xml",
   ]
 }
 
 android_library("chrome_java") {
   deps = [
-    ":chrome_public_android_manifest",
+    ":chrome_public_apk_manifest",
     ":chrome_public_apk_template_resources",
     "//base:base_java",
     "//chrome/android/webapk/libs/client:client_java",
     "//chrome/android/webapk/libs/common:common_java",
     "//chrome/android/webapk/libs/runtime_library:webapk_service_aidl_java",
     "//components/safe_json/android:safe_json_java",
     "//components/spellcheck/browser/android:java",
     "//components/variations/android:variations_java",
     "//components/web_contents_delegate_android:web_contents_delegate_android_java",
     "//components/web_restrictions:web_restrictions_java",
@@ skipping 39 matching lines @@
     "//chrome:content_setting_javagen",
     "//chrome:content_settings_type_javagen",
     "//chrome:data_use_ui_message_enum_javagen",
     "//chrome:signin_metrics_enum_javagen",
   ]
 
   # New versions of BuildConfig.java will be created when creating an apk.
   jar_excluded_patterns = [ "*/BuildConfig.class" ]
 
   # Manifest used for linting (determining unused resources).
-  android_manifest = chrome_public_android_manifest
+  android_manifest = get_target_outputs(":chrome_public_apk_manifest")
+  android_manifest = android_manifest[1]
 
   # TODO(sievers): Split java code into components. Not everything
   # is really all that UI related here.
   if (android_java_ui) {
     # From java_sources.gni.
     java_files = chrome_java_sources
 
     srcjar_deps += [
       "//chrome:page_info_connection_type_javagen",
       "//chrome:website_settings_action_javagen",
@@ skipping 329 matching lines @@
     deps += [
       ":chrome_java",
       ":chrome_public_apk_assets",
       ":chrome_public_apk_resources",
       "//base:base_java",
     ]
   }
 }
 
 chrome_public_apk_tmpl_shared("chrome_public_apk") {
-  android_manifest = chrome_public_android_manifest
-  android_manifest_dep = ":chrome_public_android_manifest"
+  android_manifest = get_target_outputs(":chrome_public_apk_manifest")
+  android_manifest = android_manifest[1]
+  android_manifest_dep = ":chrome_public_apk_manifest"
   apk_name = "ChromePublic"
   shared_libraries = [ ":chrome" ]
 
   deps = []
 }
 
 chrome_public_apk_tmpl_shared("chrome_sync_shell_apk") {
   testonly = true
-  android_manifest = chrome_sync_shell_android_manifest
-  android_manifest_dep = ":chrome_sync_shell_android_manifest"
+  android_manifest = get_target_outputs(":chrome_sync_shell_apk_manifest")
+  android_manifest = android_manifest[1]
+  android_manifest_dep = ":chrome_sync_shell_apk_manifest"
   apk_name = "ChromeSyncShell"
   shared_libraries = [ ":chrome_sync_shell" ]
 
   deps = [
     ":chrome_sync_shell_apk_template_resources",
 
     # This exists here because com.google.protobuf.nano is needed in tests,
     # but that code is stripped out via proguard. Adding this deps adds
     # usages and prevents removal of the proto code.
     "//components/sync:test_support_sync_proto_java",
@@ skipping 64 matching lines @@
 instrumentation_test_apk("chrome_sync_shell_test_apk") {
   apk_name = "ChromeSyncShellTest"
   apk_under_test = ":chrome_sync_shell_apk"
   android_manifest = chrome_sync_shell_test_apk_manifest
   android_manifest_dep = ":chrome_sync_shell_test_apk_manifest"
   deps = [
     ":chrome_sync_shell_test_apk_java",
   ]
   proguard_enabled = !is_java_debug
 }