commit 059583563d667c3953c9970bff99672b1c66e879
author Hunsuk Choi <forestchoi@google.com> Thu Sep 29 06:46:26 2022 +0000
committer Hunsuk Choi <forestchoi@google.com> Thu Sep 29 06:52:16 2022 +0000
tree 8c162b78ccb0574e9fe7d7dbc8632119b07af5a7
parent 0938e261fb2aefac239cd091c3f50fe44e9208da

Specify the version of imported android.hardware.radio

To resolve the broken build due to the multiple versions of aidl_interface android.hardware.radio co-existed, including V1 an V2.

Bug: 243344927
Bug: 248994335
Test: build
Change-Id: I39a6af55e3573366d4cbeaf56467c567a9b48113

radio/aidl/Android.bp

diff --git a/radio/aidl/Android.bp b/radio/aidl/Android.bp
index fde98fc..613f31b 100644
--- a/radio/aidl/Android.bp
+++ b/radio/aidl/Android.bp
@@ -36,7 +36,7 @@
     host_supported: true,
     srcs: ["android/hardware/radio/config/*.aidl"],
     stability: "vintf",
-    imports: ["android.hardware.radio"],
+    imports: ["android.hardware.radio-V1"],
     backend: {
         cpp: {
             enabled: true,
@@ -60,7 +60,7 @@
     host_supported: true,
     srcs: ["android/hardware/radio/data/*.aidl"],
     stability: "vintf",
-    imports: ["android.hardware.radio"],
+    imports: ["android.hardware.radio-V1"],
     backend: {
         cpp: {
             enabled: true,
@@ -84,7 +84,7 @@
     host_supported: true,
     srcs: ["android/hardware/radio/messaging/*.aidl"],
     stability: "vintf",
-    imports: ["android.hardware.radio"],
+    imports: ["android.hardware.radio-V1"],
     backend: {
         cpp: {
             enabled: true,
@@ -108,7 +108,7 @@
     host_supported: true,
     srcs: ["android/hardware/radio/modem/*.aidl"],
     stability: "vintf",
-    imports: ["android.hardware.radio"],
+    imports: ["android.hardware.radio-V1"],
     backend: {
         cpp: {
             enabled: true,
@@ -157,7 +157,7 @@
     srcs: ["android/hardware/radio/sim/*.aidl"],
     stability: "vintf",
     imports: [
-        "android.hardware.radio",
+        "android.hardware.radio-V1",
         "android.hardware.radio.config",
     ],
     backend: {
@@ -186,7 +186,7 @@
     host_supported: true,
     srcs: ["android/hardware/radio/voice/*.aidl"],
     stability: "vintf",
-    imports: ["android.hardware.radio"],
+    imports: ["android.hardware.radio-V1"],
     backend: {
         cpp: {
             enabled: true,