Fixes for GN Android build inputs/outputs

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("//tools/grit/grit_rule.gni")
 import("//tools/relocation_packer/config.gni")
 
@@ skipping 714 matching lines @@
 #     will be added to java_files and be included in this library.
 #   srcjars: List of srcjars to be included in this library, together with the
 #     ones obtained from srcjar_deps.
 #
 #   bypass_platform_checks: Disables checks about cross-platform (Java/Android)
 #     dependencies for this target. This will allow depending on an
 #     android_library target, for example.
 #
 #   chromium_code: If true, extra analysis warning/errors will be enabled.
 #
-#   datadeps, testonly
+#   data_deps, testonly
 #
 # Example
 #   java_binary("foo") {
 #     java_files = [ "org/chromium/foo/FooMain.java" ]
 #     deps = [ ":bar_java" ]
 #     main_class = "org.chromium.foo.FooMain"
 #   }
 template("java_binary") {
   set_sources_assignment_filter([])
 
   # TODO(cjhopman): This should not act like a java_library for dependents (i.e.
   # dependents shouldn't get the jar in their classpath, etc.).
   java_library_impl(target_name) {
     if (defined(invoker.DEPRECATED_java_in_dir)) {
       DEPRECATED_java_in_dir = invoker.DEPRECATED_java_in_dir
     }
     if (defined(invoker.chromium_code)) {
       chromium_code = invoker.chromium_code
     }
-    if (defined(invoker.datadeps)) {
-      deps = invoker.datadeps
+    if (defined(invoker.data_deps)) {
+      deps = invoker.data_deps
     }
     if (defined(invoker.deps)) {
       deps = invoker.deps
     }
     if (defined(invoker.java_files)) {
       java_files = invoker.java_files
     }
     if (defined(invoker.srcjar_deps)) {
       srcjar_deps = invoker.srcjar_deps
     }
@@ skipping 92 matching lines @@
 #     be used to remove unwanted parts of the library.
 #   proguard_config: Path to the proguard config for preprocessing.
 #
 #   supports_android: If true, Android targets (android_library, android_apk)
 #     may depend on this target. Note: if true, this target must only use the
 #     subset of Java available on Android.
 #   bypass_platform_checks: Disables checks about cross-platform (Java/Android)
 #     dependencies for this target. This will allow depending on an
 #     android_library target, for example.
 #
-#   datadeps, testonly
+#   data_deps, testonly
 #
 # Example
 #   java_library("foo_java") {
 #     java_files = [
 #       "org/chromium/foo/Foo.java",
 #       "org/chromium/foo/FooInterface.java",
 #       "org/chromium/foo/FooService.java",
 #     ]
 #     deps = [
 #       ":bar_java"
 #     ]
 #     srcjar_deps = [
 #       ":foo_generated_enum"
 #     ]
 #     jar_excluded_patterns = [
 #       "*/FooService.class", "*/FooService##*.class"
 #     ]
 #   }
 template("java_library") {
   set_sources_assignment_filter([])
   java_library_impl(target_name) {
     if (defined(invoker.DEPRECATED_java_in_dir)) {
       DEPRECATED_java_in_dir = invoker.DEPRECATED_java_in_dir
     }
     if (defined(invoker.chromium_code)) {
       chromium_code = invoker.chromium_code
     }
-    if (defined(invoker.datadeps)) {
-      deps = invoker.datadeps
+    if (defined(invoker.data_deps)) {
+      deps = invoker.data_deps
     }
     if (defined(invoker.deps)) {
       deps = invoker.deps
     }
     if (defined(invoker.jar_excluded_patterns)) {
       jar_excluded_patterns = invoker.jar_excluded_patterns
     }
     if (defined(invoker.java_files)) {
       java_files = invoker.java_files
     }
@@ skipping 114 matching lines @@
   set_sources_assignment_filter([])
   assert(!defined(invoker.jar_path),
          "android_library does not support a custom jar path")
   java_library_impl(target_name) {
     if (defined(invoker.DEPRECATED_java_in_dir)) {
       DEPRECATED_java_in_dir = invoker.DEPRECATED_java_in_dir
     }
     if (defined(invoker.chromium_code)) {
       chromium_code = invoker.chromium_code
     }
-    if (defined(invoker.datadeps)) {
-      deps = invoker.datadeps
+    if (defined(invoker.data_deps)) {
+      deps = invoker.data_deps
     }
     if (defined(invoker.deps)) {
       deps = invoker.deps
     }
     if (defined(invoker.jar_excluded_patterns)) {
       jar_excluded_patterns = invoker.jar_excluded_patterns
     }
     if (defined(invoker.java_files)) {
       java_files = invoker.java_files
     }
@@ skipping 98 matching lines @@
   }
 }
 
 # Declare an Android apk target
 #
 # This target creates an Android APK containing java code, resources, assets,
 # and (possibly) native libraries.
 #
 # Variables
 #   android_manifest: Path to AndroidManifest.xml.
-#   datadeps: List of dependencies needed at runtime. These will be built but
+#   data_deps: List of dependencies needed at runtime. These will be built but
 #     won't change the generated .apk in any way (in fact they may be built
 #     after the .apk is).
 #   deps: List of dependencies. All Android java resources and libraries in the
 #     "transitive closure" of these dependencies will be included in the apk.
 #     Note: this "transitive closure" actually only includes such targets if
 #     they are depended on through android_library or android_resources targets
 #     (and so not through builtin targets like 'action', 'group', etc).
 #   java_files: List of .java files to include in the apk.
 #   srcjar_deps: List of srcjar dependencies. The .java files in the srcjars
 #      will be added to java_files and be included in this apk.
@@ skipping 38 matching lines @@
   }
 
   assert(defined(invoker.final_apk_path) || defined(invoker.apk_name))
   assert(defined(invoker.android_manifest))
   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"
-  _template_name = target_name
+  final_dex_target_name = "${_template_name}__final_dex"
+
   _final_apk_path = ""
   if (defined(invoker.final_apk_path)) {
     _final_apk_path = invoker.final_apk_path
   } else if (defined(invoker.apk_name)) {
     _final_apk_path = "$root_build_dir/apks/" + invoker.apk_name + ".apk"
   }
   _dist_jar_path_list =
       process_file_template(
           [ _final_apk_path ],
           "$root_build_dir/test.lib.java/{{source_name_part}}.jar")
@@ skipping 20 matching lines @@
     _keystore_password = invoker.keystore_password
   }
 
   _srcjar_deps = []
   if (defined(invoker.srcjar_deps)) {
     _srcjar_deps += invoker.srcjar_deps
   }
 
   _load_library_from_apk = false
 
+  # The dependency that makes the chromium linker, if any is needed.
+  _chromium_linker_dep = []
+
   if (defined(invoker.native_libs)) {
     _use_chromium_linker = false
     if (defined(invoker.use_chromium_linker)) {
       _use_chromium_linker =
           invoker.use_chromium_linker && chromium_linker_supported
+      _chromium_linker_dep = [ "//base/android/linker:chromium_android_linker" ]
     }
 
     if (defined(invoker.load_library_from_apk) &&
         invoker.load_library_from_apk) {
       _load_library_from_apk = true
       assert(_use_chromium_linker,
              "Loading library from the apk requires use" +
                  " of the Chromium linker.")
     }
 
@@ skipping 31 matching lines @@
   _android_manifest = invoker.android_manifest
   _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)
 
-  write_build_config("${_template_name}__build_config") {
+  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
     if (defined(invoker.deps)) {
-      deps = 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
-    build_config = _build_config
 
     if (defined(invoker.include_all_resources)) {
       include_all_resources = invoker.include_all_resources
     }
+
+    build_config = _build_config
+    deps = [
+      ":$build_config_target",
+    ]
   }
-  _srcjar_deps += [ ":${_template_name}__process_resources" ]
+  _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
     }
 
     java_cpp_template("${_template_name}__native_libraries_java") {
       package_name = "org/chromium/base/library_loader"
       sources = [
@@ skipping 67 matching lines @@
       inputs += [ jar_path ]
       _rebased_jar_path = rebase_path([ jar_path ], root_build_dir)
       args += [ "--inputs=$_rebased_jar_path" ]
       deps = [
         # This target generates the jar file.
         ":$java_target",
       ]
     }
   }
 
-  final_deps += [ ":${_template_name}__final_dex" ]
-  dex("${_template_name}__final_dex") {
+  final_deps += [ ":$final_dex_target_name" ]
+  dex("$final_dex_target_name") {
     deps = [
       ":${_template_name}__java",
     ]
     sources = [
       jar_path,
     ]
     inputs = [
       _build_config,
     ]
     output = final_dex_path
     dex_arg_key = "${_rebased_build_config}:final_dex:dependency_dex_files"
     args = [ "--inputs=@FileArg($dex_arg_key)" ]
   }
 
   if (_native_libs != []) {
     action("${_template_name}__prepare_native") {
       script = "//build/android/gyp/pack_arm_relocations.py"
       packed_libraries_dir = "$_native_libs_dir/$android_app_abi"
       depfile = "$target_gen_dir/$target_name.d"
       outputs = [
         depfile,
       ]
       inputs = [ _build_config ] + _native_libs
-      deps = []
+      deps = _chromium_linker_dep
       skip_packing_list = [
         "gdbserver",
         "libchromium_android_linker.so",
       ]
 
       enable_packing_arg = 0
       if (_enable_relocation_packing) {
         enable_packing_arg = 1
         deps += [ relocation_packer_target ]
       }
@@ skipping 46 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",
     ]
 
     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
@@ skipping 37 matching lines @@
 
       native_libs_dir = _native_libs_dir
       deps = [
         ":${_template_name}__prepare_native",
       ]
     }
   }
 
   group(target_name) {
     deps = final_deps
-    if (defined(invoker.datadeps)) {
-      datadeps = invoker.datadeps
+    if (defined(invoker.data_deps)) {
+      data_deps = invoker.data_deps
     }
   }
 }
 
 # Declare an Android gtest apk
 #
 # This target creates an Android apk for running gtest-based unittests.
 #
 # Variables
 #   deps: Specifies the dependencies of this target. These will be passed to
@@ skipping 52 matching lines @@
       asset_location = invoker.asset_location
     }
     deps = [
       "//base:base_java",
       "//build/android/pylib/remote/device/dummy:remote_device_dummy_apk",
       "//testing/android/appurify_support:appurify_support_java",
     ]
     if (defined(invoker.deps)) {
       deps += invoker.deps
     }
-    datadeps = [
-      "//tools/android/md5sum",
-    ]
+    data_deps = [ "//tools/android/md5sum" ]
     if (host_os == "linux") {
-      datadeps += [ "//tools/android/forwarder2" ]
+      data_deps += [ "//tools/android/forwarder2" ]
     }
-    if (defined(invoker.datadeps)) {
-      datadeps += invoker.datadeps
+    if (defined(invoker.data_deps)) {
+      data_deps += invoker.data_deps
     }
   }
 }
 
 # Generate .java files from .aidl files.
 #
 # This target will store the .java files in a srcjar and should be included in
 # an android_library or android_apk's srcjar_deps.
 #
 # Variables
@@ skipping 213 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) {
   }
 }