Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(541)

Unified Diff: components/cronet/android/BUILD.gn

Issue 1533353002: GN: asset_location -> android_assets() for cronet (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: testonly, sorted files, comment. Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/cronet/android/BUILD.gn
diff --git a/components/cronet/android/BUILD.gn b/components/cronet/android/BUILD.gn
index e81f294ef0336242de5093d80a804db2c52fd130..0d01f07adf1502c89417e2a8aa2a330d26b1e0d5 100644
--- a/components/cronet/android/BUILD.gn
+++ b/components/cronet/android/BUILD.gn
@@ -409,14 +409,50 @@ android_library("cronet_test_apk_java") {
]
}
+android_assets("cronet_test_apk_assets") {
+ testonly = true
+
+ # Need to use renaming_sources to maintain subdirectories.
+ renaming_sources = [
+ "test/assets/test/cacheable.txt",
+ "test/assets/test/cacheable.txt.mock-http-headers",
+ "test/assets/test/content_length_mismatch.html",
+ "test/assets/test/content_length_mismatch.html.mock-http-headers",
+ "test/assets/test/datareductionproxysuccess.txt",
+ "test/assets/test/datareductionproxysuccess.txt.mock-http-headers",
+ "test/assets/test/multiredirect.html",
+ "test/assets/test/multiredirect.html.mock-http-headers",
+ "test/assets/test/notfound.html",
+ "test/assets/test/notfound.html.mock-http-headers",
+ "test/assets/test/quic_data/simple.txt",
+ "test/assets/test/redirect.html",
+ "test/assets/test/redirect.html.mock-http-headers",
+ "test/assets/test/redirect_invalid_scheme.html",
+ "test/assets/test/redirect_invalid_scheme.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/index.mock-http-headers",
+ "test/assets/test/sdch/LeQxM80O_encoded",
+ "test/assets/test/sdch/LeQxM80O_encoded.mock-http-headers",
+ "test/assets/test/secureproxychecksuccess.txt",
+ "test/assets/test/secureproxychecksuccess.txt.mock-http-headers",
+ "test/assets/test/success.txt",
+ "test/assets/test/success.txt.mock-http-headers",
+ ]
+
+ # Maintain directory structure. Example entry: "test/sdch/index".
+ renaming_destinations = rebase_path(renaming_sources, "test/assets")
+}
+
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",
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698