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

Re-enable radio satellite tests. radio to V3

Browse Source 
This moves everything to radio-V3. What happened was satellite-V1 was
added with changes to the radio HAL in master. When radio-V2 was
frozen on goog/master, this showed up as radio-V2 having backwards
incompatible changes in goog/master. So I disabled the build files
there. Now that radio-V2 is frozen, we can re-enable the usage
of radio-V3 types in master (the VTS test was the only thing using
these new types).

In order to resolve this, I’ve moved all the radio libs over to V3.
Ideally, we could have moved one service over at a time, as
"satellite" support was needed. Though I’ve done this expecting other
radio libs to change in V3, this will mean we don’t expect more radio
.bp changes in Android V.

One alternative to this would have been to change the other radio libs
to import V3, but this is considered somewhat of a hack, and it would be
guaranteed to break any vendor-owned builds. With the current change,
vendor-owned build configs should still work as-is until they manually
add satellite.

Test: hal_implementation_test, vts_treble_vintf_vendor_test
Bug: 277379745

Change-Id: Iedc3097a9db58c0539e4aa61d089ee9d1986d51f
This commit is contained in:
Steven Moreland
2023-04-11 21:27:15 +00:00
parent f0dd725535
commit 771b5c19f3
6 changed files with 52 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
compatibility_matrices/compatibility_matrix.8.xml
View File

@@ -491,16 +491,6 @@
<instance>slot3</instance>
</interface>
</hal>
<hal format="aidl" optional="true">
<name>android.hardware.radio.satellite</name>
<version>1</version>
<interface>
<name>IRadioSatellite</name>
<instance>slot1</instance>
<instance>slot2</instance>
<instance>slot3</instance>
</interface>
</hal>
<hal format="aidl" optional="true">
<name>android.hardware.radio.ims.media</name>
<version>1</version>

18
compatibility_matrices/compatibility_matrix.9.xml
View File

@@ -405,7 +405,7 @@
</hal>
<hal format="aidl" optional="true">
<name>android.hardware.radio.config</name>
<version>2</version>
<version>3</version>
<interface>
<name>IRadioConfig</name>
<instance>default</instance>
@@ -413,7 +413,7 @@
</hal>
<hal format="aidl" optional="true">
<name>android.hardware.radio.data</name>
<version>2</version>
<version>3</version>
<interface>
<name>IRadioData</name>
<instance>slot1</instance>
@@ -423,7 +423,7 @@
</hal>
<hal format="aidl" optional="true">
<name>android.hardware.radio.messaging</name>
<version>2</version>
<version>3</version>
<interface>
<name>IRadioMessaging</name>
<instance>slot1</instance>
@@ -433,7 +433,7 @@
</hal>
<hal format="aidl" optional="true">
<name>android.hardware.radio.modem</name>
<version>2</version>
<version>3</version>
<interface>
<name>IRadioModem</name>
<instance>slot1</instance>
@@ -443,7 +443,7 @@
</hal>
<hal format="aidl" optional="true">
<name>android.hardware.radio.network</name>
<version>2</version>
<version>3</version>
<interface>
<name>IRadioNetwork</name>
<instance>slot1</instance>
@@ -453,7 +453,7 @@
</hal>
<hal format="aidl" optional="true">
<name>android.hardware.radio.sim</name>
<version>2</version>
<version>3</version>
<interface>
<name>IRadioSim</name>
<instance>slot1</instance>
@@ -473,7 +473,7 @@
</hal>
<hal format="aidl" optional="true">
<name>android.hardware.radio.voice</name>
<version>2</version>
<version>3</version>
<interface>
<name>IRadioVoice</name>
<instance>slot1</instance>
@@ -483,7 +483,7 @@
</hal>
<hal format="aidl" optional="true">
<name>android.hardware.radio.ims</name>
<version>1</version>
<version>2</version>
<interface>
<name>IRadioIms</name>
<instance>slot1</instance>
@@ -503,7 +503,7 @@
</hal>
<hal format="aidl" optional="true">
<name>android.hardware.radio.ims.media</name>
<version>1</version>
<version>2</version>
<interface>
<name>IImsMedia</name>
<instance>default</instance>

43
radio/aidl/Android.bp
View File

@@ -12,7 +12,6 @@ aidl_interface {
vendor_available: true,
host_supported: true,
srcs: ["android/hardware/radio/*.aidl"],
frozen: true,
stability: "vintf",
backend: {
cpp: {
@@ -41,9 +40,8 @@ aidl_interface {
vendor_available: true,
host_supported: true,
srcs: ["android/hardware/radio/config/*.aidl"],
frozen: true,
stability: "vintf",
imports: ["android.hardware.radio-V2"],
imports: ["android.hardware.radio-V3"],
backend: {
cpp: {
enabled: true,
@@ -72,7 +70,7 @@ aidl_interface {
host_supported: true,
srcs: ["android/hardware/radio/data/*.aidl"],
stability: "vintf",
imports: ["android.hardware.radio-V2"],
imports: ["android.hardware.radio-V3"],
backend: {
cpp: {
enabled: true,
@@ -92,8 +90,6 @@ aidl_interface {
},
],
frozen: true,
}
aidl_interface {
@@ -102,7 +98,7 @@ aidl_interface {
host_supported: true,
srcs: ["android/hardware/radio/messaging/*.aidl"],
stability: "vintf",
imports: ["android.hardware.radio-V2"],
imports: ["android.hardware.radio-V3"],
backend: {
cpp: {
enabled: true,
@@ -122,8 +118,6 @@ aidl_interface {
},
],
frozen: true,
}
aidl_interface {
@@ -132,7 +126,7 @@ aidl_interface {
host_supported: true,
srcs: ["android/hardware/radio/modem/*.aidl"],
stability: "vintf",
imports: ["android.hardware.radio-V2"],
imports: ["android.hardware.radio-V3"],
backend: {
cpp: {
enabled: true,
@@ -152,8 +146,6 @@ aidl_interface {
},
],
frozen: true,
}
aidl_interface {
@@ -162,7 +154,7 @@ aidl_interface {
host_supported: true,
srcs: ["android/hardware/radio/network/*.aidl"],
stability: "vintf",
imports: ["android.hardware.radio-V2"],
imports: ["android.hardware.radio-V3"],
backend: {
cpp: {
enabled: true,
@@ -182,8 +174,6 @@ aidl_interface {
},
],
frozen: true,
}
aidl_interface {
@@ -212,7 +202,6 @@ aidl_interface {
},
],
frozen: true,
}
aidl_interface {
@@ -222,8 +211,8 @@ aidl_interface {
srcs: ["android/hardware/radio/sim/*.aidl"],
stability: "vintf",
imports: [
"android.hardware.radio-V2",
"android.hardware.radio.config-V2",
"android.hardware.radio-V3",
"android.hardware.radio.config-V3",
],
backend: {
cpp: {
@@ -250,8 +239,6 @@ aidl_interface {
},
],
frozen: true,
}
aidl_interface {
@@ -260,7 +247,7 @@ aidl_interface {
host_supported: true,
srcs: ["android/hardware/radio/voice/*.aidl"],
stability: "vintf",
imports: ["android.hardware.radio-V2"],
imports: ["android.hardware.radio-V3"],
backend: {
cpp: {
enabled: true,
@@ -280,8 +267,6 @@ aidl_interface {
},
],
frozen: true,
}
aidl_interface {
@@ -290,8 +275,8 @@ aidl_interface {
srcs: ["android/hardware/radio/ims/media/*.aidl"],
stability: "vintf",
imports: [
"android.hardware.radio-V2",
"android.hardware.radio.data-V2",
"android.hardware.radio-V3",
"android.hardware.radio.data-V3",
],
backend: {
cpp: {
@@ -310,8 +295,6 @@ aidl_interface {
],
},
],
frozen: true,
}
aidl_interface {
@@ -319,7 +302,7 @@ aidl_interface {
vendor_available: true,
srcs: ["android/hardware/radio/ims/*.aidl"],
stability: "vintf",
imports: ["android.hardware.radio-V2"],
imports: ["android.hardware.radio-V3"],
backend: {
cpp: {
enabled: false,
@@ -334,8 +317,6 @@ aidl_interface {
imports: ["android.hardware.radio-V2"],
},
],
frozen: true,
}
aidl_interface {
@@ -343,7 +324,7 @@ aidl_interface {
vendor_available: true,
srcs: ["android/hardware/radio/satellite/*.aidl"],
stability: "vintf",
imports: ["android.hardware.radio-V2"],
imports: ["android.hardware.radio-V3"],
backend: {
cpp: {
enabled: false,

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

@@ -31,21 +31,21 @@ cc_library {
"-DANDROID_UTILS_REF_BASE_DISABLE_IMPLICIT_CONSTRUCTION",
],
shared_libs: [
"android.hardware.radio.config-V2-ndk",
"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-V2-ndk",
"android.hardware.radio.ims-V1-ndk",
"android.hardware.radio.ims.media-V1-ndk",
"android.hardware.radio.messaging-V2-ndk",
"android.hardware.radio.modem-V2-ndk",
"android.hardware.radio.network-V2-ndk",
"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.satellite-V1-ndk",
"android.hardware.radio.sim-V2-ndk",
"android.hardware.radio.voice-V2-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",

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

@@ -34,21 +34,21 @@ cc_binary {
],
shared_libs: [
"android.hardware.radio-library.compat",
"android.hardware.radio.config-V2-ndk",
"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-V2-ndk",
"android.hardware.radio.ims-V1-ndk",
"android.hardware.radio.ims.media-V1-ndk",
"android.hardware.radio.messaging-V2-ndk",
"android.hardware.radio.modem-V2-ndk",
"android.hardware.radio.network-V2-ndk",
"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.satellite-V1-ndk",
"android.hardware.radio.sim-V2-ndk",
"android.hardware.radio.voice-V2-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",

26
radio/aidl/vts/Android.bp
View File

@@ -58,9 +58,9 @@ cc_test {
"radio_network_test.cpp",
"radio_sap_callback.cpp",
"radio_sap_test.cpp",
// "radio_satellite_indication.cpp",
// "radio_satellite_response.cpp",
// "radio_satellite_test.cpp",
"radio_satellite_indication.cpp",
"radio_satellite_response.cpp",
"radio_satellite_test.cpp",
"radio_sim_indication.cpp",
"radio_sim_response.cpp",
"radio_sim_test.cpp",
@@ -74,18 +74,18 @@ cc_test {
"libvintf",
],
static_libs: [
"android.hardware.radio-V2-ndk",
"android.hardware.radio.config-V2-ndk",
"android.hardware.radio.data-V2-ndk",
"android.hardware.radio.ims-V1-ndk",
"android.hardware.radio.ims.media-V1-ndk",
"android.hardware.radio.messaging-V2-ndk",
"android.hardware.radio.modem-V2-ndk",
"android.hardware.radio.network-V2-ndk",
"android.hardware.radio-V3-ndk",
"android.hardware.radio.config-V3-ndk",
"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.satellite-V1-ndk",
"android.hardware.radio.sim-V2-ndk",
"android.hardware.radio.voice-V2-ndk",
"android.hardware.radio.sim-V3-ndk",
"android.hardware.radio.voice-V3-ndk",
],
test_suites: [
"general-tests",