LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Revert "Bundle Cronet's boringssl""

Browse Source
This commit is contained in:
Treehugger Robot
2023-03-15 00:31:21 +00:00
committed by Gerrit Code Review
parent b21fe216cc 77c084d1f6
commit 853ef56fb6
3 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Cronet/tests/mts/Android.bp
View File

@@ -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: [

12
Tethering/apex/Android.bp
View File

@@ -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"],
},
},
}

8
Tethering/common/TetheringLib/Android.bp
View File

@@ -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"
],
}