Index: components/cronet/android/BUILD.gn |
diff --git a/components/cronet/android/BUILD.gn b/components/cronet/android/BUILD.gn |
index e81f294ef0336242de5093d80a804db2c52fd130..4a95ab1f452a59bb61fb1fcf4ce3c97c3d503238 100644 |
--- a/components/cronet/android/BUILD.gn |
+++ b/components/cronet/android/BUILD.gn |
@@ -409,14 +409,46 @@ android_library("cronet_test_apk_java") { |
] |
} |
+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 e
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", |