🎊 Reland #2 of Have build_config targets depend only on other build_config targets

content/shell/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("//third_party/icu/config.gni")
 
 generate_jni("content_shell_jni_headers") {
@@ skipping 55 matching lines @@
   testonly = true
   input = "shell_apk/AndroidManifest.xml.jinja2"
   output = content_shell_manifest
 }
 
 android_resources("content_shell_apk_resources") {
   testonly = true
   resource_dirs = [ "shell_apk/res" ]
   deps = [
     ":content_shell_java_resources",
-    ":content_shell_manifest",
   ]
   android_manifest = content_shell_manifest
+  android_manifest_dep = ":content_shell_manifest"
 }
 
 android_library("content_shell_apk_java") {
   testonly = true
   deps = [
     ":content_shell_apk_resources",
     ":content_shell_java",
     "//base:base_java",
     "//content/public/android:content_java",
     "//media/capture/video/android:capture_java",
@@ skipping 80 matching lines @@
   jinja_template("chromium_linker_test_manifest") {
     testonly = true
     input = "linker_test_apk/AndroidManifest.xml.jinja2"
     output = chromium_linker_test_manifest
   }
 
   android_resources("linker_resources") {
     testonly = true
     resource_dirs = [ "linker_test_apk/res" ]
     android_manifest = chromium_linker_test_manifest
-    deps = [
-      ":chromium_linker_test_manifest",
-    ]
+    android_manifest_dep = ":chromium_linker_test_manifest"
   }
 
   # GYP: //content/content_tests.gypi:chromium_linker_test_apk
   android_apk("chromium_linker_test_apk") {
     testonly = true
     deps = [
       ":content_shell_assets",
       ":content_shell_java",
       ":linker_resources",
       "//base:base_java",
@@ skipping 48 matching lines @@
   testonly = true
   deps = [
     ":content_shell_java",
     "//base:base_java",
     "//content/public/android:content_java",
     "//testing/android/native_test:native_test_java",
     "//ui/android:ui_java",
   ]
   java_files = [ "browsertests/src/org/chromium/content_shell/browsertests/ContentShellBrowserTestActivity.java" ]
 }