From 719715821dfc932047c1ebcf4e99747dfb6970af Mon Sep 17 00:00:00 2001 From: Sarah Chin Date: Thu, 23 Sep 2021 23:18:13 -0700 Subject: [PATCH] Move IRadioConfig into IRadio Test: build Bug: 198331451 Change-Id: I884aab7c6d76ef9610e3d239e9fbfe9e6568bfff --- radio/aidl/Android.bp | 21 +++++++ .../hardware/radio/config/IRadioConfig.aidl | 0 .../radio/config/IRadioConfigIndication.aidl | 0 .../radio/config/IRadioConfigResponse.aidl | 0 .../radio/config/PhoneCapability.aidl | 0 .../hardware/radio/config/SimSlotStatus.aidl | 0 .../hardware/radio/config/IRadioConfig.aidl | 0 .../radio/config/IRadioConfigIndication.aidl | 0 .../radio/config/IRadioConfigResponse.aidl | 0 .../radio/config/PhoneCapability.aidl | 0 .../hardware/radio/config/SimSlotStatus.aidl | 0 radio/config/aidl/Android.bp | 55 ------------------- 12 files changed, 21 insertions(+), 55 deletions(-) rename radio/{config => }/aidl/aidl_api/android.hardware.radio.config/current/android/hardware/radio/config/IRadioConfig.aidl (100%) rename radio/{config => }/aidl/aidl_api/android.hardware.radio.config/current/android/hardware/radio/config/IRadioConfigIndication.aidl (100%) rename radio/{config => }/aidl/aidl_api/android.hardware.radio.config/current/android/hardware/radio/config/IRadioConfigResponse.aidl (100%) rename radio/{config => }/aidl/aidl_api/android.hardware.radio.config/current/android/hardware/radio/config/PhoneCapability.aidl (100%) rename radio/{config => }/aidl/aidl_api/android.hardware.radio.config/current/android/hardware/radio/config/SimSlotStatus.aidl (100%) rename radio/{config => }/aidl/android/hardware/radio/config/IRadioConfig.aidl (100%) rename radio/{config => }/aidl/android/hardware/radio/config/IRadioConfigIndication.aidl (100%) rename radio/{config => }/aidl/android/hardware/radio/config/IRadioConfigResponse.aidl (100%) rename radio/{config => }/aidl/android/hardware/radio/config/PhoneCapability.aidl (100%) rename radio/{config => }/aidl/android/hardware/radio/config/SimSlotStatus.aidl (100%) delete mode 100644 radio/config/aidl/Android.bp diff --git a/radio/aidl/Android.bp b/radio/aidl/Android.bp index 2cf824f205..88bdc2ea7a 100644 --- a/radio/aidl/Android.bp +++ b/radio/aidl/Android.bp @@ -27,6 +27,27 @@ aidl_interface { }, } +aidl_interface { + name: "android.hardware.radio.config", + vendor_available: true, + srcs: ["android/hardware/radio/config/*.aidl"], + stability: "vintf", + imports: ["android.hardware.radio"], + backend: { + cpp: { + enabled: false, + }, + java: { + sdk_version: "module_current", + }, + ndk: { + vndk: { + enabled: true, + }, + }, + }, +} + aidl_interface { name: "android.hardware.radio.data", vendor_available: true, diff --git a/radio/config/aidl/aidl_api/android.hardware.radio.config/current/android/hardware/radio/config/IRadioConfig.aidl b/radio/aidl/aidl_api/android.hardware.radio.config/current/android/hardware/radio/config/IRadioConfig.aidl similarity index 100% rename from radio/config/aidl/aidl_api/android.hardware.radio.config/current/android/hardware/radio/config/IRadioConfig.aidl rename to radio/aidl/aidl_api/android.hardware.radio.config/current/android/hardware/radio/config/IRadioConfig.aidl diff --git a/radio/config/aidl/aidl_api/android.hardware.radio.config/current/android/hardware/radio/config/IRadioConfigIndication.aidl b/radio/aidl/aidl_api/android.hardware.radio.config/current/android/hardware/radio/config/IRadioConfigIndication.aidl similarity index 100% rename from radio/config/aidl/aidl_api/android.hardware.radio.config/current/android/hardware/radio/config/IRadioConfigIndication.aidl rename to radio/aidl/aidl_api/android.hardware.radio.config/current/android/hardware/radio/config/IRadioConfigIndication.aidl diff --git a/radio/config/aidl/aidl_api/android.hardware.radio.config/current/android/hardware/radio/config/IRadioConfigResponse.aidl b/radio/aidl/aidl_api/android.hardware.radio.config/current/android/hardware/radio/config/IRadioConfigResponse.aidl similarity index 100% rename from radio/config/aidl/aidl_api/android.hardware.radio.config/current/android/hardware/radio/config/IRadioConfigResponse.aidl rename to radio/aidl/aidl_api/android.hardware.radio.config/current/android/hardware/radio/config/IRadioConfigResponse.aidl diff --git a/radio/config/aidl/aidl_api/android.hardware.radio.config/current/android/hardware/radio/config/PhoneCapability.aidl b/radio/aidl/aidl_api/android.hardware.radio.config/current/android/hardware/radio/config/PhoneCapability.aidl similarity index 100% rename from radio/config/aidl/aidl_api/android.hardware.radio.config/current/android/hardware/radio/config/PhoneCapability.aidl rename to radio/aidl/aidl_api/android.hardware.radio.config/current/android/hardware/radio/config/PhoneCapability.aidl diff --git a/radio/config/aidl/aidl_api/android.hardware.radio.config/current/android/hardware/radio/config/SimSlotStatus.aidl b/radio/aidl/aidl_api/android.hardware.radio.config/current/android/hardware/radio/config/SimSlotStatus.aidl similarity index 100% rename from radio/config/aidl/aidl_api/android.hardware.radio.config/current/android/hardware/radio/config/SimSlotStatus.aidl rename to radio/aidl/aidl_api/android.hardware.radio.config/current/android/hardware/radio/config/SimSlotStatus.aidl diff --git a/radio/config/aidl/android/hardware/radio/config/IRadioConfig.aidl b/radio/aidl/android/hardware/radio/config/IRadioConfig.aidl similarity index 100% rename from radio/config/aidl/android/hardware/radio/config/IRadioConfig.aidl rename to radio/aidl/android/hardware/radio/config/IRadioConfig.aidl diff --git a/radio/config/aidl/android/hardware/radio/config/IRadioConfigIndication.aidl b/radio/aidl/android/hardware/radio/config/IRadioConfigIndication.aidl similarity index 100% rename from radio/config/aidl/android/hardware/radio/config/IRadioConfigIndication.aidl rename to radio/aidl/android/hardware/radio/config/IRadioConfigIndication.aidl diff --git a/radio/config/aidl/android/hardware/radio/config/IRadioConfigResponse.aidl b/radio/aidl/android/hardware/radio/config/IRadioConfigResponse.aidl similarity index 100% rename from radio/config/aidl/android/hardware/radio/config/IRadioConfigResponse.aidl rename to radio/aidl/android/hardware/radio/config/IRadioConfigResponse.aidl diff --git a/radio/config/aidl/android/hardware/radio/config/PhoneCapability.aidl b/radio/aidl/android/hardware/radio/config/PhoneCapability.aidl similarity index 100% rename from radio/config/aidl/android/hardware/radio/config/PhoneCapability.aidl rename to radio/aidl/android/hardware/radio/config/PhoneCapability.aidl diff --git a/radio/config/aidl/android/hardware/radio/config/SimSlotStatus.aidl b/radio/aidl/android/hardware/radio/config/SimSlotStatus.aidl similarity index 100% rename from radio/config/aidl/android/hardware/radio/config/SimSlotStatus.aidl rename to radio/aidl/android/hardware/radio/config/SimSlotStatus.aidl diff --git a/radio/config/aidl/Android.bp b/radio/config/aidl/Android.bp deleted file mode 100644 index 801747a0a1..0000000000 --- a/radio/config/aidl/Android.bp +++ /dev/null @@ -1,55 +0,0 @@ -package { - // See: http://go/android-license-faq - // A large-scale-change added 'default_applicable_licenses' to import - // all of the 'license_kinds' from "hardware_interfaces_license" - // to get the below license kinds: - // SPDX-license-identifier-Apache-2.0 - default_applicable_licenses: ["hardware_interfaces_license"], -} - -aidl_interface { - name: "android.hardware.radio.config", - vendor_available: true, - srcs: ["android/hardware/radio/config/*.aidl"], - stability: "vintf", - imports: ["android.hardware.radio"], - backend: { - cpp: { - enabled: false, - }, - java: { - sdk_version: "module_current", - }, - ndk: { - vndk: { - enabled: true, - }, - }, - }, -} - -cc_library { - name: "android.hardware.radio.config-translate-ndk", - vendor_available: true, - shared_libs: [ - "libbinder_ndk", - "libhidlbase", - "android.hardware.radio.config-V1-ndk_platform", - "android.hardware.radio.config@1.0", - "android.hardware.radio.config@1.1", - "android.hardware.radio.config@1.2", - "android.hardware.radio.config@1.3", - ], -} - -java_library { - name: "android.hardware.radio.config-translate-java", - libs: [ - "android.hardware.radio.config-V1-java", - "android.hardware.radio.config-V1.0-java", - "android.hardware.radio.config-V1.1-java", - "android.hardware.radio.config-V1.2-java", - "android.hardware.radio.config-V1.3-java", - ], - sdk_version: "module_current", -}