GN: asset_location -> android_assets() for html_viewer

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("//build/toolchain/toolchain.gni")
 import("//third_party/android_platform/config.gni")
 import("//tools/grit/grit_rule.gni")
@@ skipping 1183 matching lines @@
 #   native_libs: List paths of native libraries to include in this apk. If these
 #     libraries depend on other shared_library targets, those dependencies will
 #     also be included in the apk.
 #   native_lib_placeholders: List of placeholder filenames to add to the apk
 #     (optional).
 #   apk_under_test: For an instrumentation test apk, this is the target of the
 #     tested apk.
 #   include_all_resources - If true include all resource IDs in all generated
 #     R.java files.
 #   testonly: Marks this target as "test-only".
+#   write_asset_list: Adds an extra file to the assets, which contains a list of
+#     all other asset files.
 #
 #   DEPRECATED_java_in_dir: Directory containing java files. All .java files in
 #     this directory will be included in the library. This is only supported to
 #     ease the gyp->gn conversion and will be removed in the future.
 #
 # Example
 #   android_apk("foo_apk") {
 #     android_manifest = "AndroidManifest.xml"
 #     java_files = [
 #       "android/org/chromium/foo/FooApplication.java",
@@ skipping 434 matching lines @@
   _final_deps += [ ":${_template_name}__create" ]
   create_apk("${_template_name}__create") {
     deps = []
     forward_variables_from(invoker,
                            [
                              "asset_location",
                              "deps",
                              "extensions_to_not_compress",
                              "language_splits",
                              "shared_resources",
+                             "write_asset_list",
                            ])
     apk_path = _final_apk_path
     android_manifest = _android_manifest
     assets_build_config = _build_config
     resources_zip = _all_resources_zip_path
     dex_path = final_dex_path
     load_library_from_apk = _load_library_from_apk
     create_density_splits = _create_density_splits
     emma_instrument = emma_coverage && !_emma_never_instrument
 
@@ skipping 237 matching lines @@
 #             of the unittests_dep target postfixed with "_apk"
 #   use_default_launcher: Whether the default activity (NativeUnitTestActivity)
 #     should be used for launching tests.
 #
 # Example
 #   unittest_apk("foo_unittests_apk") {
 #     deps = [ ":foo_java", ":foo_resources" ]
 #     unittests_dep = ":foo_unittests"
 #   }
 template("unittest_apk") {
-  set_sources_assignment_filter([])
-  testonly = true
+  android_apk(target_name) {
+    set_sources_assignment_filter([])
+    data_deps = []
+    deps = []
+    forward_variables_from(invoker, "*")
+    testonly = true
 
-  assert(defined(invoker.unittests_dep), "Need unittests_dep for $target_name")
+    assert(defined(unittests_dep), "Need unittests_dep for $target_name")
 
-  test_suite_name = get_label_info(invoker.unittests_dep, "name")
+    test_suite_name = get_label_info(unittests_dep, "name")
 
-  # This trivial assert is needed in case both unittests_binary and apk_name
-  # are defined, as otherwise test_suite_name would not be used.
-  assert(test_suite_name != "")
+    # This trivial assert is needed in case both unittests_binary and apk_name
+    # are defined, as otherwise test_suite_name would not be used.
+    assert(test_suite_name != "")
 
-  if (defined(invoker.unittests_binary)) {
-    unittests_binary = invoker.unittests_binary
-  } else {
-    unittests_binary = "lib${test_suite_name}${shlib_extension}"
-  }
+    if (!defined(apk_name)) {
+      apk_name = test_suite_name
+    }
 
-  if (defined(invoker.apk_name)) {
-    apk_name = invoker.apk_name
-  } else {
-    apk_name = test_suite_name
-  }
+    if (!defined(android_manifest)) {
+      android_manifest =
+          "//testing/android/native_test/java/AndroidManifest.xml"
+    }
 
-  android_apk(target_name) {
-    forward_variables_from(invoker,
-                           [
-                             "asset_location",
-                             "android_manifest",
-                           ])
+    if (!defined(unittests_binary)) {
+      unittests_binary = "lib${test_suite_name}${shlib_extension}"
+    }
+
     final_apk_path = "$root_build_dir/${apk_name}_apk/${apk_name}-debug.apk"
 
-    if (!defined(invoker.use_default_launcher) || invoker.use_default_launcher) {
+    if (!defined(use_default_launcher) || use_default_launcher) {
       java_files = [
         "//testing/android/native_test/java/src/org/chromium/native_test/NativeBrowserTestActivity.java",
         "//testing/android/native_test/java/src/org/chromium/native_test/NativeTestActivity.java",
         "//testing/android/native_test/java/src/org/chromium/native_test/NativeUnitTestActivity.java",
         "//testing/android/native_test/java/src/org/chromium/native_test/NativeTestInstrumentationTestRunner.java",
       ]
     }
-    if (!defined(invoker.android_manifest)) {
-      android_manifest =
-          "//testing/android/native_test/java/AndroidManifest.xml"
-    }
     native_libs = [ unittests_binary ]
-    deps = [
+    deps += [
       "//base:base_java",
       "//build/android/pylib/remote/device/dummy:remote_device_dummy_apk",
       "//testing/android/appurify_support:appurify_support_java",
       "//testing/android/reporter:reporter_java",
     ]
-    if (defined(invoker.deps)) {
-      deps += invoker.deps
-    }
-    data_deps = [
-      "//tools/android/md5sum",
-    ]
+    data_deps += [ "//tools/android/md5sum" ]
     if (host_os == "linux") {
       data_deps += [ "//tools/android/forwarder2" ]
     }
-    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
 #   sources: Paths to .aidl files to compile.
@@ skipping 213 matching lines @@
   }
 
   android_library(target_name) {
     java_files = []
     srcjar_deps = [ ":${_template_name}__protoc_java" ]
     deps = [
       "//third_party/android_protobuf:protobuf_nano_javalib",
     ]
   }
 }