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

Merge "Revert "Bundle Cronet's boringssl"" am: 853ef56fb6

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2487884

Change-Id: I9e7867451e0275a36752da2e6b5bd2878926c6bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-03-15 00:58:22 +00:00
committed by Automerger Merge Worker
parent 01f4997eb5 853ef56fb6
commit 3f7bd80351
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 { android_library {
name: "NetHttpTestsLibPreJarJar", name: "NetHttpTestsLibPreJarJar",
srcs: ["//external/cronet:cronet_aml_javatests_sources"], srcs: [":cronet_aml_javatests_sources"],
sdk_version: "test_current", sdk_version: "test_current",
min_sdk_version: "30", min_sdk_version: "30",
static_libs: [ static_libs: [

12
Tethering/apex/Android.bp
View File

@@ -66,19 +66,11 @@ apex_defaults {
apex_defaults { apex_defaults {
name: "CronetInTetheringApexDefaultsEnabled", name: "CronetInTetheringApexDefaultsEnabled",
jni_libs: [ jni_libs: ["cronet_aml_components_cronet_android_cronet"],
"//external/cronet:cronet_aml_components_cronet_android_cronet",
"//external/cronet/third_party/boringssl:libcrypto",
"//external/cronet/third_party/boringssl:libssl",
],
arch: { arch: {
riscv64: { riscv64: {
// TODO: remove this when there is a riscv64 libcronet // TODO: remove this when there is a riscv64 libcronet
exclude_jni_libs: [ exclude_jni_libs: ["cronet_aml_components_cronet_android_cronet"],
"//external/cronet:cronet_aml_components_cronet_android_cronet",
"//external/cronet/third_party/boringssl:libcrypto",
"//external/cronet/third_party/boringssl:libssl",
],
}, },
}, },
} }

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

@@ -75,12 +75,12 @@ java_defaults {
java_defaults { java_defaults {
name: "CronetJavaDefaultsEnabled", name: "CronetJavaDefaultsEnabled",
srcs: ["//external/cronet:cronet_aml_api_sources"], srcs: [":cronet_aml_api_sources"],
libs: [ libs: [
"androidx.annotation_annotation", "androidx.annotation_annotation",
], ],
impl_only_static_libs: [ impl_only_static_libs: [
"//external/cronet:cronet_aml_java", "cronet_aml_java",
], ],
api_dir: "cronet_enabled/api", api_dir: "cronet_enabled/api",
} }
@@ -101,8 +101,8 @@ java_defaults {
java_defaults { java_defaults {
name: "CronetJavaPrejarjarDefaultsEnabled", name: "CronetJavaPrejarjarDefaultsEnabled",
static_libs: [ static_libs: [
"//external/cronet:cronet_aml_api_java", "cronet_aml_api_java",
"//external/cronet:cronet_aml_java" "cronet_aml_java"
], ],
} }