From ddbb1fd3650a3085104efab026d2130df0f014a7 Mon Sep 17 00:00:00 2001 From: Tomasz Wasilczyk Date: Thu, 24 Oct 2024 10:52:42 -0700 Subject: [PATCH] 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/libradiocompat/Android.bp | 33 +++++++++++++-------- radio/aidl/compat/service/Android.bp | 11 +------ 2 files changed, 21 insertions(+), 23 deletions(-) diff --git a/radio/aidl/compat/libradiocompat/Android.bp b/radio/aidl/compat/libradiocompat/Android.bp index d78455ebce..569dd1e8ce 100644 --- a/radio/aidl/compat/libradiocompat/Android.bp +++ b/radio/aidl/compat/libradiocompat/Android.bp @@ -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", diff --git a/radio/aidl/compat/service/Android.bp b/radio/aidl/compat/service/Android.bp index c8bbd4cf29..3d46d4f89a 100644 --- a/radio/aidl/compat/service/Android.bp +++ b/radio/aidl/compat/service/Android.bp @@ -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",