commit ddbb1fd3650a3085104efab026d2130df0f014a7
author Tomasz Wasilczyk <twasilczyk@google.com> Thu Oct 24 10:52:42 2024 -0700
committer Tomasz Wasilczyk <twasilczyk@google.com> Thu Oct 24 11:30:48 2024 -0700
tree 5c672309f0c76b65bb4186e546cd6ababd72905f
parent 1058da5f434990c68188e225488061491cbde7ff

libradiocompat: Move all AIDL dependencies to a separate cc_defaults

This will make it easier to upgrade these dependencies, since they have
to be on the same version across all users.

Bug: 366194627
Test: m
Test: ABTD v2/telephonycomm/cts_telephony_tests
Change-Id: Ib8352bd3ac5d23b986992443b5f594e83c4fac07

radio/aidl/compat/service/Android.bp

diff --git a/radio/aidl/compat/service/Android.bp b/radio/aidl/compat/service/Android.bp
index c8bbd4c..3d46d4f 100644
--- a/radio/aidl/compat/service/Android.bp
+++ b/radio/aidl/compat/service/Android.bp
@@ -24,6 +24,7 @@
 
 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 @@
     ],
     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",