Add support for reading `net/data/ssl/certificates` files
* After supporting netty, the certificates files are needed to start up the HTTP server. Those files must be moved to the emulator which happens through the changes in AndroidTest.xml, isolated-storage
has been disabled to allow the emulator to access the storage freely without restriction. Otherwise
I will have to change the destination of the data files which will result in divergence.
* Added the newly introduced test utility java classes including netty to the `jarjar_excludes` as they must not be jarjared because they are not part of the bootclasspath.
Test: atest NetHttpTests
Bug: 319629150
Bug: 304217500
Change-Id: I2331873a9e178783319f889a377ba7e390ecdd6f
diff --git a/Cronet/tests/mts/Android.bp b/Cronet/tests/mts/Android.bp
index 63905c8..743a1ca 100644
--- a/Cronet/tests/mts/Android.bp
+++ b/Cronet/tests/mts/Android.bp
@@ -48,19 +48,20 @@
}
android_test {
- name: "NetHttpTests",
- defaults: [
+ name: "NetHttpTests",
+ defaults: [
"mts-target-sdk-version-current",
- ],
- static_libs: ["NetHttpTestsLibPreJarJar"],
- jarjar_rules: ":net-http-test-jarjar-rules",
- jni_libs: [
+ ],
+ static_libs: ["NetHttpTestsLibPreJarJar"],
+ jarjar_rules: ":net-http-test-jarjar-rules",
+ jni_libs: [
"cronet_aml_components_cronet_android_cronet__testing",
"cronet_aml_components_cronet_android_cronet_tests__testing",
- ],
- test_suites: [
- "general-tests",
- "mts-tethering",
- ],
+ "cronet_aml_third_party_netty_tcnative_netty_tcnative_so__testing",
+ ],
+ test_suites: [
+ "general-tests",
+ "mts-tethering",
+ ],
+ data: [":cronet_javatests_resources"],
}
-