GN: asset_location -> android_assets() for cronet

components/cronet/android/BUILD.gn

 # Copyright 2015 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/rules.gni")
 import("//build/util/version.gni")
 import("//chrome/version.gni")
 import("//testing/test.gni")
 
 assert(!is_component_build, "Cronet requires static library build.")
@@ skipping 391 matching lines @@
   DEPRECATED_java_in_dir = "test/src"
 
   deps = [
     ":cronet_api",
     ":cronet_java",
     "//base:base_java",
     "//net/android:net_java_test_support",
   ]
 }
 
+android_assets("cronet_test_apk_assets") {

[mef, 2015/12/21 18:21:31]

should have testonly = true

[agrieve, 2015/12/21 18:55:35]

Done.

+  # Need to use renaming_sources to maintain subdirectories.
+  renaming_sources = [
+    "test/assets/test/cacheable.txt",
+    "test/assets/test/multiredirect.html.mock-http-headers",
+    "test/assets/test/sdch/dict/LeQxM80O",
+    "test/assets/test/sdch/dict/LeQxM80O.mock-http-headers",
+    "test/assets/test/sdch/index",
+    "test/assets/test/sdch/LeQxM80O_encoded",
+    "test/assets/test/sdch/LeQxM80O_encoded.mock-http-headers",
+    "test/assets/test/sdch/index.mock-http-headers",
+    "test/assets/test/multiredirect.html",

[mef, 2015/12/21 18:21:31]

could / should these be sorted alphabetically?

[agrieve, 2015/12/21 18:55:35]

Done.

+    "test/assets/test/content_length_mismatch.html.mock-http-headers",
+    "test/assets/test/redirect.html",
+    "test/assets/test/notfound.html.mock-http-headers",
+    "test/assets/test/redirect_invalid_scheme.html",
+    "test/assets/test/redirect.html.mock-http-headers",
+    "test/assets/test/cacheable.txt.mock-http-headers",
+    "test/assets/test/success.txt",
+    "test/assets/test/datareductionproxysuccess.txt",
+    "test/assets/test/success.txt.mock-http-headers",
+    "test/assets/test/secureproxychecksuccess.txt.mock-http-headers",
+    "test/assets/test/secureproxychecksuccess.txt",
+    "test/assets/test/quic_data/simple.txt",
+    "test/assets/test/content_length_mismatch.html",
+    "test/assets/test/redirect_invalid_scheme.html.mock-http-headers",
+    "test/assets/test/datareductionproxysuccess.txt.mock-http-headers",
+    "test/assets/test/notfound.html",
+  ]
+  renaming_destinations = rebase_path(renaming_sources, "test/assets")

[mef, 2015/12/21 18:21:32]

Could you clarify what how would this rename for example

test/assets/test/cacheable.txt
and 
test/assets/test/sdch/dict/LeQxM80O.mock-http-headers

[agrieve, 2015/12/21 18:55:35]

Done.

+}
+
 android_apk("cronet_test_apk") {
   testonly = true
   apk_name = "CronetTest"
   android_manifest = "test/AndroidManifest.xml"
   native_libs = [ "libcronet_tests.so" ]
-  asset_location = "test/assets"
 
   deps = [
+    ":cronet_test_apk_assets",
     ":cronet_test_apk_java",
     ":cronet_test_apk_resources",
     ":cronet_tests",
     "//base:base_java",
   ]
 
   run_findbugs = true
 }
 
 instrumentation_test_apk("cronet_test_instrumentation_apk") {
@@ skipping 24 matching lines @@
 
   deps = [
     ":cronet_static",
     "//base",
     "//base/test:test_support",
     "//components/metrics",
     "//net",
     "//testing/gtest",
   ]
 }