Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 16:50:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "libradiocompat: Move all AIDL dependencies to a separate cc_defaults" into main

Browse Source
This commit is contained in:
Tomasz Wasilczyk
2024-10-28 17:28:00 +00:00
committed by Gerrit Code Review
parent 1ee583fda3 ddbb1fd365
commit 65dc358765
2 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
radio/aidl/compat/libradiocompat/Android.bp
View File

@@ -22,21 +22,10 @@ package {
default_applicable_licenses: ["hardware_interfaces_license"],
}
cc_library {
name: "android.hardware.radio-library.compat",
relative_install_path: "hw",
vendor: true,
cflags: [
"-Wall",
"-Wextra",
"-DANDROID_UTILS_REF_BASE_DISABLE_IMPLICIT_CONSTRUCTION",
],
cc_defaults {
name: "android.hardware.radio-library.aidl_deps",
shared_libs: [
"android.hardware.radio.config-V3-ndk",
"android.hardware.radio.config@1.0",
"android.hardware.radio.config@1.1",
"android.hardware.radio.config@1.2",
"android.hardware.radio.config@1.3",
"android.hardware.radio.data-V3-ndk",
"android.hardware.radio.ims-V2-ndk",
"android.hardware.radio.ims.media-V2-ndk",
@@ -46,6 +35,24 @@ cc_library {
"android.hardware.radio.sap-V1-ndk",
"android.hardware.radio.sim-V3-ndk",
"android.hardware.radio.voice-V3-ndk",
],
}
cc_library {
name: "android.hardware.radio-library.compat",
defaults: ["android.hardware.radio-library.aidl_deps"],
relative_install_path: "hw",
vendor: true,
cflags: [
"-Wall",
"-Wextra",
"-DANDROID_UTILS_REF_BASE_DISABLE_IMPLICIT_CONSTRUCTION",
],
shared_libs: [
"android.hardware.radio.config@1.0",
"android.hardware.radio.config@1.1",
"android.hardware.radio.config@1.2",
"android.hardware.radio.config@1.3",
"android.hardware.radio@1.0",
"android.hardware.radio@1.1",
"android.hardware.radio@1.2",

11
radio/aidl/compat/service/Android.bp
View File

@@ -24,6 +24,7 @@ package {
cc_binary {
name: "android.hardware.radio-service.compat",
defaults: ["android.hardware.radio-library.aidl_deps"],
relative_install_path: "hw",
init_rc: ["radio-compat.rc"],
vintf_fragments: ["radio-compat.xml"],
@@ -35,20 +36,10 @@ cc_binary {
],
shared_libs: [
"android.hardware.radio-library.compat",
"android.hardware.radio.config-V3-ndk",
"android.hardware.radio.config@1.0",
"android.hardware.radio.config@1.1",
"android.hardware.radio.config@1.2",
"android.hardware.radio.config@1.3",
"android.hardware.radio.data-V3-ndk",
"android.hardware.radio.ims-V2-ndk",
"android.hardware.radio.ims.media-V2-ndk",
"android.hardware.radio.messaging-V3-ndk",
"android.hardware.radio.modem-V3-ndk",
"android.hardware.radio.network-V3-ndk",
"android.hardware.radio.sap-V1-ndk",
"android.hardware.radio.sim-V3-ndk",
"android.hardware.radio.voice-V3-ndk",
"android.hardware.radio@1.0",
"android.hardware.radio@1.1",
"android.hardware.radio@1.2",