| Index: components/html_viewer/BUILD.gn
 | 
| diff --git a/components/html_viewer/BUILD.gn b/components/html_viewer/BUILD.gn
 | 
| index 447d0a221304828c1421a6d0c1c90a6303a98faa..4e4110452a4c5a332b6165cae031e40cb92f936a 100644
 | 
| --- a/components/html_viewer/BUILD.gn
 | 
| +++ b/components/html_viewer/BUILD.gn
 | 
| @@ -9,7 +9,7 @@ import("//tools/grit/grit_rule.gni")
 | 
|  import("//tools/grit/repack.gni")
 | 
|  
 | 
|  if (is_android) {
 | 
| -  import("//build/config/android/internal_rules.gni")
 | 
| +  import("//build/config/android/rules.gni")
 | 
|    import("//mojo/generate_mojo_shell_assets_list.gni")
 | 
|  }
 | 
|  
 | 
| @@ -291,27 +291,15 @@ mojo_native_application("layout_test_html_viewer") {
 | 
|  }
 | 
|  
 | 
|  if (is_android) {
 | 
| -  html_viewer_unittests_assets = "$root_build_dir/html_viewer_unittests_assets"
 | 
| -
 | 
| -  copy_ex("copy_unittest_assets") {
 | 
| -    clear_dir = true
 | 
| -    deps = [
 | 
| -      ":pak",
 | 
| -      "//gin",
 | 
| -    ]
 | 
| -    dest = html_viewer_unittests_assets
 | 
| +  android_assets("unittest_assets") {
 | 
|      sources = [
 | 
|        "$root_build_dir/html_viewer.pak",
 | 
|      ]
 | 
| -    renaming_sources = v8_external_startup_data_renaming_sources
 | 
| -    renaming_destinations = v8_external_startup_data_renaming_destinations
 | 
| -  }
 | 
| -
 | 
| -  generate_mojo_shell_assets_list("build_unittest_assets") {
 | 
|      deps = [
 | 
| -      ":copy_unittest_assets",
 | 
| +      ":pak",
 | 
| +      "//v8:v8_external_startup_data_assets",
 | 
|      ]
 | 
| -    dir = html_viewer_unittests_assets
 | 
| +    disable_compression = true
 | 
|    }
 | 
|  }
 | 
|  
 | 
| @@ -340,8 +328,8 @@ test("html_viewer_unittests") {
 | 
|    ]
 | 
|  
 | 
|    if (is_android) {
 | 
| -    deps += [ ":build_unittest_assets" ]
 | 
| -    apk_asset_location = html_viewer_unittests_assets
 | 
| +    apk_deps = [ ":unittest_assets" ]
 | 
| +    write_asset_list = true
 | 
|    }
 | 
|  
 | 
|    configs += [ "//v8:external_startup_data" ]
 | 
| 
 |