Skip to content
Snippets Groups Projects
Commit 77c084d1 authored by Patrick Rohr's avatar Patrick Rohr Committed by Gerrit Code Review
Browse files

Revert "Bundle Cronet's boringssl"

This reverts commit 2cd4ac87.

Reason for revert: b/273575026

Change-Id: I5b9886465b8a0f71af469d303a39f670a9b0cb68
parent 2cd4ac87
No related branches found
No related tags found
No related merge requests found
......@@ -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: [
......
......@@ -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"],
},
},
}
......
......@@ -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"
],
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment