joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge changes from topic "cronet_121_0_6167_71" into main

Browse source 
* changes:
  [Cronet] Disable one of setURLStreamHandlerFactory test
  cronet 121_0_6167_71: remove http_client_logging lib
This commit is contained in:
Treehugger Robot 2024-03-08 10:08:20 +00:00 • committed by Gerrit Code Review
commit 14d2e19e47
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Cronet/tests/mts/AndroidTest.xml
View file

@ -53,6 +53,8 @@
<option name="exclude-filter" value="org.chromium.net.NetworkChangesTest" />
<!-- b/316550794 -->
<option name="exclude-filter" value="org.chromium.net.impl.CronetLoggerTest#testEngineCreation" />
<!-- b/327182569 -->
<option name="exclude-filter" value="org.chromium.net.urlconnection.CronetURLStreamHandlerFactoryTest#testSetUrlStreamFactoryUsesCronetForNative" />
<option name="hidden-api-checks" value="false"/>
<option name="isolated-storage" value="false"/>
</test>
@ -62,4 +64,4 @@
class="com.android.tradefed.testtype.suite.module.MainlineTestModuleController">
<option name="mainline-module-package-name" value="com.google.android.tethering" />
</object>
</configuration>
</configuration>

2
framework/Android.bp
View file

@ -116,7 +116,6 @@ java_library {
static_libs: [
"httpclient_api",
"httpclient_impl",
"http_client_logging",
// Framework-connectivity-pre-jarjar is identical to framework-connectivity
// implementation, but without the jarjar rules. However, framework-connectivity
// is not based on framework-connectivity-pre-jarjar, it's rebuilt from source
@ -145,7 +144,6 @@ java_defaults {
],
impl_only_static_libs: [
"httpclient_impl",
"http_client_logging",
],
}