commit 77c084d1f6559c5f1032222ff3601ac5a3a1e215
author Patrick Rohr <prohr@google.com> Tue Mar 14 22:45:06 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 14 22:45:06 2023 +0000
tree 925c5b37f9c52067cd17260dd9d81299b7aa9167
parent 2cd4ac872558c6248e8c641eb263547445ca0dec

Revert "Bundle Cronet's boringssl"

This reverts commit 2cd4ac872558c6248e8c641eb263547445ca0dec.

Reason for revert: b/273575026

Change-Id: I5b9886465b8a0f71af469d303a39f670a9b0cb68

Tethering/apex/Android.bp

diff --git a/Tethering/apex/Android.bp b/Tethering/apex/Android.bp
index ff5acf5..67206cd 100644
--- a/Tethering/apex/Android.bp
+++ b/Tethering/apex/Android.bp
@@ -66,19 +66,11 @@
 
 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"],
         },
     },
 }

Tethering/common/TetheringLib/Android.bp

diff --git a/Tethering/common/TetheringLib/Android.bp b/Tethering/common/TetheringLib/Android.bp
index b99c9e4..4080029 100644
--- a/Tethering/common/TetheringLib/Android.bp
+++ b/Tethering/common/TetheringLib/Android.bp
@@ -75,12 +75,12 @@
 
 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 {
   name: "CronetJavaPrejarjarDefaultsEnabled",
   static_libs: [
-    "//external/cronet:cronet_aml_api_java",
-    "//external/cronet:cronet_aml_java"
+    "cronet_aml_api_java",
+    "cronet_aml_java"
   ],
 }