Replace most uses of asset_location with android_assets() template

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 68 matching lines @@
     ":content_shell_java",
     "//base:base_java",
     "//content/public/android:content_java",
     "//media/base/android:media_java",
     "//net/android:net_java",
     "//ui/android:ui_java",
   ]
   DEPRECATED_java_in_dir = "shell_apk/src"
 }
 
-content_shell_assets_dir = "$root_build_dir/content_shell/assets"
-copy_ex("copy_content_shell_assets") {
-  clear_dir = true
-  dest = content_shell_assets_dir
+android_assets("content_shell_assets") {
   sources = [
     "$root_out_dir/content_shell.pak",
   ]
+  disable_compression = true

[brettw, 2015/11/10 22:11:05]

This sticks out to me as weird. Maybe add a comment about why we don't want
compression for this target?

[pkotwicz, 2015/11/10 22:20:08]

We no longer compress .pak files in the APK since
https://codereview.chromium.org/1181953002

Not compressing the .pak file here is consistent with the default value of
'extensions_to_not_compress' in java_apk.gypi

   deps = [
     "//content/shell:pak",
+    "//third_party/icu:icu_assets",
+    "//v8:v8_external_startup_data_assets",
   ]
-
-  if (icu_use_data_file) {
-    sources += [ "$root_build_dir/icudtl.dat" ]
-    deps += [ "//third_party/icu:icudata" ]
-  }
-  if (v8_use_external_startup_data) {
-    renaming_sources = v8_external_startup_data_renaming_sources
-    renaming_destinations = v8_external_startup_data_renaming_destinations
-    deps += [ "//v8" ]
-  }
 }
 
 android_apk("content_shell_apk") {
   testonly = true
   data_deps = [
     # "//tools/android/forwarder",
   ]
   deps = [
     ":content_shell_apk_java",
     ":content_shell_apk_resources",
+    ":content_shell_assets",
     ":content_shell_java",
     ":content_shell_manifest",
-    ":copy_content_shell_assets",
     ":libcontent_shell_content_view",
     "//base:base_java",
     "//content/public/android:content_java",
     "//media/base/android:media_java",
     "//net/android:net_java",
 
     #"//third_party/mesa:osmesa_in_lib_dir",
     "//ui/android:ui_java",
   ]
   apk_name = "ContentShell"
   android_manifest = content_shell_manifest
   native_libs = [ "libcontent_shell_content_view.so" ]
-  asset_location = content_shell_assets_dir
 
   # TODO(GYP)
   #'extra_native_libs': ['<(SHARED_LIB_DIR)/libosmesa.so'],
 }
 
 android_library("content_shell_test_java") {
   testonly = true
   deps = [
     ":content_shell_java",
     ":content_shell_apk_java",
@@ skipping 38 matching lines @@
     deps = [
       ":chromium_linker_test_manifest",
     ]
   }
 
   # GYP: //content/content_tests.gypi:chromium_linker_test_apk
   android_apk("chromium_linker_test_apk") {
     testonly = true
     deps = [
       ":chromium_linker_test_manifest",
+      ":content_shell_assets",
       ":content_shell_java",
-      ":copy_content_shell_assets",
       ":linker_resources",
       ":linker_test",
       "//base:base_java",
       "//content/public/android:content_java",
       "//ui/android:ui_java",
     ]
     android_manifest = chromium_linker_test_manifest
-    asset_location = content_shell_assets_dir
     apk_name = "ChromiumLinkerTest"
     DEPRECATED_java_in_dir = "linker_test_apk/src"
     native_libs = [ "liblinker_test.so" ]
     use_chromium_linker = true
     enable_chromium_linker_tests = true
   }
 
   # GYP: //content/content_tests.gypi:chromium_android_linker_test
   shared_library("linker_test") {
     testonly = true
@@ skipping 16 matching lines @@
 
   # GYP: //content/content_tests.gypi:chromium_android_linker_test_jni_headers
   generate_jni("linker_test_jni_headers") {
     testonly = true
     jni_package = "content/shell"
     sources = [
       "linker_test_apk/src/org/chromium/chromium_linker_test_apk/LinkerTests.java",
     ]
   }
 }