From 09f0d47b06bdd0b112463e04b9eab875c0c827ea Mon Sep 17 00:00:00 2001 From: Chidera Olibie Date: Wed, 28 Feb 2024 10:15:40 +0000 Subject: [PATCH 1/2] cronet 121_0_6167_71: remove http_client_logging lib Cronet telemetry has been implemented in a more centralised version in chromium and is not a different target anymore. See b/311369704 for more details. Test: atest NetHttpTests Bug: b/322154153 Change-Id: I6d9a13b1ffc25b51ca0d2cbadd86b40b399f89ac --- framework/Android.bp | 2 -- 1 file changed, 2 deletions(-) diff --git a/framework/Android.bp b/framework/Android.bp index 1356eea1ef..f2a639223b 100644 --- a/framework/Android.bp +++ b/framework/Android.bp @@ -117,7 +117,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 @@ -147,7 +146,6 @@ java_defaults { ], impl_only_static_libs: [ "httpclient_impl", - "http_client_logging", ], } From 0f4c915eae12d1b66a486b95e01672243168e358 Mon Sep 17 00:00:00 2001 From: Chidera Olibie Date: Tue, 27 Feb 2024 15:26:54 +0000 Subject: [PATCH 2/2] [Cronet] Disable one of setURLStreamHandlerFactory test Bug: b/327182569 Test: atest NetHttpTests Change-Id: Ibd49567fb8198c7c5b4b8808a5e8181dc32eea61 --- Cronet/tests/mts/AndroidTest.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Cronet/tests/mts/AndroidTest.xml b/Cronet/tests/mts/AndroidTest.xml index bccbe2915f..513b988d00 100644 --- a/Cronet/tests/mts/AndroidTest.xml +++ b/Cronet/tests/mts/AndroidTest.xml @@ -53,6 +53,8 @@