From 77c084d1f6559c5f1032222ff3601ac5a3a1e215 Mon Sep 17 00:00:00 2001
From: Patrick Rohr <prohr@google.com>
Date: Tue, 14 Mar 2023 22:45:06 +0000
Subject: [PATCH] Revert "Bundle Cronet's boringssl"
This reverts commit 2cd4ac872558c6248e8c641eb263547445ca0dec.
Reason for revert: b/273575026
Change-Id: I5b9886465b8a0f71af469d303a39f670a9b0cb68
---
Cronet/tests/mts/Android.bp | 2 +-
Tethering/apex/Android.bp | 12 ++----------
Tethering/common/TetheringLib/Android.bp | 8 ++++----
3 files changed, 7 insertions(+), 15 deletions(-)
diff --git a/Cronet/tests/mts/Android.bp b/Cronet/tests/mts/Android.bp
index ac716534da..03d163cd9a 100644
--- a/Cronet/tests/mts/Android.bp
+++ b/Cronet/tests/mts/Android.bp
@@ -19,7 +19,7 @@ package {
android_library {
name: "NetHttpTestsLibPreJarJar",
- srcs: ["//external/cronet:cronet_aml_javatests_sources"],
+ srcs: [":cronet_aml_javatests_sources"],
sdk_version: "test_current",
min_sdk_version: "30",
static_libs: [
diff --git a/Tethering/apex/Android.bp b/Tethering/apex/Android.bp
index ff5acf5d9b..67206cde31 100644
--- a/Tethering/apex/Android.bp
+++ b/Tethering/apex/Android.bp
@@ -66,19 +66,11 @@ apex_defaults {
apex_defaults {
name: "CronetInTetheringApexDefaultsEnabled",
- jni_libs: [
- "//external/cronet:cronet_aml_components_cronet_android_cronet",
- "//external/cronet/third_party/boringssl:libcrypto",
- "//external/cronet/third_party/boringssl:libssl",
- ],
+ jni_libs: ["cronet_aml_components_cronet_android_cronet"],
arch: {
riscv64: {
// TODO: remove this when there is a riscv64 libcronet
- exclude_jni_libs: [
- "//external/cronet:cronet_aml_components_cronet_android_cronet",
- "//external/cronet/third_party/boringssl:libcrypto",
- "//external/cronet/third_party/boringssl:libssl",
- ],
+ exclude_jni_libs: ["cronet_aml_components_cronet_android_cronet"],
},
},
}
diff --git a/Tethering/common/TetheringLib/Android.bp b/Tethering/common/TetheringLib/Android.bp
index b99c9e4899..4080029f48 100644
--- a/Tethering/common/TetheringLib/Android.bp
+++ b/Tethering/common/TetheringLib/Android.bp
@@ -75,12 +75,12 @@ java_defaults {
java_defaults {
name: "CronetJavaDefaultsEnabled",
- srcs: ["//external/cronet:cronet_aml_api_sources"],
+ srcs: [":cronet_aml_api_sources"],
libs: [
"androidx.annotation_annotation",
],
impl_only_static_libs: [
- "//external/cronet:cronet_aml_java",
+ "cronet_aml_java",
],
api_dir: "cronet_enabled/api",
}
@@ -101,8 +101,8 @@ java_defaults {
java_defaults {
name: "CronetJavaPrejarjarDefaultsEnabled",
static_libs: [
- "//external/cronet:cronet_aml_api_java",
- "//external/cronet:cronet_aml_java"
+ "cronet_aml_api_java",
+ "cronet_aml_java"
],
}
--
GitLab