Move IRadioConfig into IRadio
Test: build
Bug: 198331451
Change-Id: I884aab7c6d76ef9610e3d239e9fbfe9e6568bfff
diff --git a/radio/aidl/Android.bp b/radio/aidl/Android.bp
index 2cf824f..88bdc2e 100644
--- a/radio/aidl/Android.bp
+++ b/radio/aidl/Android.bp
@@ -28,6 +28,27 @@
}
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,
srcs: ["android/hardware/radio/data/*.aidl"],
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 801747a..0000000
--- 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",
-}