From 1e84e8735439694d1725640d643fcb3adf9525fc Mon Sep 17 00:00:00 2001 From: Giovanni Ricca Date: Sun, 1 Jun 2025 19:02:09 +0200 Subject: [PATCH] interfaces: Generic-ify `hidl_package_root` name Change-Id: I85a185ef6abce31579f3e2cfdd3b02e9beabfef6 --- interfaces/Android.bp | 11 ++++++----- interfaces/{ => hardware}/mtkpower/1.0/Android.bp | 2 +- interfaces/{ => hardware}/mtkpower/1.0/IMtkPerf.hal | 0 interfaces/{ => hardware}/mtkpower/1.0/IMtkPower.hal | 0 interfaces/{ => hardware}/mtkpower/1.1/Android.bp | 2 +- interfaces/{ => hardware}/mtkpower/1.1/IMtkPerf.hal | 0 interfaces/{ => hardware}/mtkpower/1.1/IMtkPower.hal | 0 .../{ => hardware}/mtkpower/1.1/IMtkPowerCallback.hal | 0 interfaces/{ => hardware}/mtkpower/1.2/Android.bp | 2 +- interfaces/{ => hardware}/mtkpower/1.2/IMtkPerf.hal | 0 interfaces/{ => hardware}/mtkpower/1.2/IMtkPower.hal | 0 .../{ => hardware}/mtkpower/1.2/IMtkPowerCallback.hal | 0 interfaces/mtkpower/1.0/.hidl-autogen | 0 interfaces/mtkpower/1.1/.hidl-autogen | 0 interfaces/mtkpower/1.2/.hidl-autogen | 0 interfaces/updates-makefiles.sh | 2 +- 16 files changed, 10 insertions(+), 9 deletions(-) rename interfaces/{ => hardware}/mtkpower/1.0/Android.bp (88%) rename interfaces/{ => hardware}/mtkpower/1.0/IMtkPerf.hal (100%) rename interfaces/{ => hardware}/mtkpower/1.0/IMtkPower.hal (100%) rename interfaces/{ => hardware}/mtkpower/1.1/Android.bp (90%) rename interfaces/{ => hardware}/mtkpower/1.1/IMtkPerf.hal (100%) rename interfaces/{ => hardware}/mtkpower/1.1/IMtkPower.hal (100%) rename interfaces/{ => hardware}/mtkpower/1.1/IMtkPowerCallback.hal (100%) rename interfaces/{ => hardware}/mtkpower/1.2/Android.bp (91%) rename interfaces/{ => hardware}/mtkpower/1.2/IMtkPerf.hal (100%) rename interfaces/{ => hardware}/mtkpower/1.2/IMtkPower.hal (100%) rename interfaces/{ => hardware}/mtkpower/1.2/IMtkPowerCallback.hal (100%) delete mode 100644 interfaces/mtkpower/1.0/.hidl-autogen delete mode 100644 interfaces/mtkpower/1.1/.hidl-autogen delete mode 100644 interfaces/mtkpower/1.2/.hidl-autogen diff --git a/interfaces/Android.bp b/interfaces/Android.bp index c573638..f3ffd20 100644 --- a/interfaces/Android.bp +++ b/interfaces/Android.bp @@ -1,10 +1,11 @@ -subdirs = [ - "*", -] +// +// SPDX-FileCopyrightText: The LineageOS Project +// SPDX-License-Identifier: Apache-2.0 +// hidl_package_root { - name: "vendor.mediatek.hardware.mtkpower", - path: "hardware/mediatek/interfaces/mtkpower", + name: "vendor.mediatek.hardware", + path: "hardware/mediatek/interfaces/hardware", } prebuilt_hidl_interfaces { diff --git a/interfaces/mtkpower/1.0/Android.bp b/interfaces/hardware/mtkpower/1.0/Android.bp similarity index 88% rename from interfaces/mtkpower/1.0/Android.bp rename to interfaces/hardware/mtkpower/1.0/Android.bp index ace1acf..1512e09 100644 --- a/interfaces/mtkpower/1.0/Android.bp +++ b/interfaces/hardware/mtkpower/1.0/Android.bp @@ -4,7 +4,7 @@ hidl_interface { name: "vendor.mediatek.hardware.mtkpower@1.0", - root: "vendor.mediatek.hardware.mtkpower", + root: "vendor.mediatek.hardware", system_ext_specific: true, srcs: [ "IMtkPerf.hal", diff --git a/interfaces/mtkpower/1.0/IMtkPerf.hal b/interfaces/hardware/mtkpower/1.0/IMtkPerf.hal similarity index 100% rename from interfaces/mtkpower/1.0/IMtkPerf.hal rename to interfaces/hardware/mtkpower/1.0/IMtkPerf.hal diff --git a/interfaces/mtkpower/1.0/IMtkPower.hal b/interfaces/hardware/mtkpower/1.0/IMtkPower.hal similarity index 100% rename from interfaces/mtkpower/1.0/IMtkPower.hal rename to interfaces/hardware/mtkpower/1.0/IMtkPower.hal diff --git a/interfaces/mtkpower/1.1/Android.bp b/interfaces/hardware/mtkpower/1.1/Android.bp similarity index 90% rename from interfaces/mtkpower/1.1/Android.bp rename to interfaces/hardware/mtkpower/1.1/Android.bp index 8efa98c..708de0c 100644 --- a/interfaces/mtkpower/1.1/Android.bp +++ b/interfaces/hardware/mtkpower/1.1/Android.bp @@ -4,7 +4,7 @@ hidl_interface { name: "vendor.mediatek.hardware.mtkpower@1.1", - root: "vendor.mediatek.hardware.mtkpower", + root: "vendor.mediatek.hardware", system_ext_specific: true, srcs: [ "IMtkPerf.hal", diff --git a/interfaces/mtkpower/1.1/IMtkPerf.hal b/interfaces/hardware/mtkpower/1.1/IMtkPerf.hal similarity index 100% rename from interfaces/mtkpower/1.1/IMtkPerf.hal rename to interfaces/hardware/mtkpower/1.1/IMtkPerf.hal diff --git a/interfaces/mtkpower/1.1/IMtkPower.hal b/interfaces/hardware/mtkpower/1.1/IMtkPower.hal similarity index 100% rename from interfaces/mtkpower/1.1/IMtkPower.hal rename to interfaces/hardware/mtkpower/1.1/IMtkPower.hal diff --git a/interfaces/mtkpower/1.1/IMtkPowerCallback.hal b/interfaces/hardware/mtkpower/1.1/IMtkPowerCallback.hal similarity index 100% rename from interfaces/mtkpower/1.1/IMtkPowerCallback.hal rename to interfaces/hardware/mtkpower/1.1/IMtkPowerCallback.hal diff --git a/interfaces/mtkpower/1.2/Android.bp b/interfaces/hardware/mtkpower/1.2/Android.bp similarity index 91% rename from interfaces/mtkpower/1.2/Android.bp rename to interfaces/hardware/mtkpower/1.2/Android.bp index 28e26df..8b28845 100644 --- a/interfaces/mtkpower/1.2/Android.bp +++ b/interfaces/hardware/mtkpower/1.2/Android.bp @@ -4,7 +4,7 @@ hidl_interface { name: "vendor.mediatek.hardware.mtkpower@1.2", - root: "vendor.mediatek.hardware.mtkpower", + root: "vendor.mediatek.hardware", system_ext_specific: true, srcs: [ "IMtkPerf.hal", diff --git a/interfaces/mtkpower/1.2/IMtkPerf.hal b/interfaces/hardware/mtkpower/1.2/IMtkPerf.hal similarity index 100% rename from interfaces/mtkpower/1.2/IMtkPerf.hal rename to interfaces/hardware/mtkpower/1.2/IMtkPerf.hal diff --git a/interfaces/mtkpower/1.2/IMtkPower.hal b/interfaces/hardware/mtkpower/1.2/IMtkPower.hal similarity index 100% rename from interfaces/mtkpower/1.2/IMtkPower.hal rename to interfaces/hardware/mtkpower/1.2/IMtkPower.hal diff --git a/interfaces/mtkpower/1.2/IMtkPowerCallback.hal b/interfaces/hardware/mtkpower/1.2/IMtkPowerCallback.hal similarity index 100% rename from interfaces/mtkpower/1.2/IMtkPowerCallback.hal rename to interfaces/hardware/mtkpower/1.2/IMtkPowerCallback.hal diff --git a/interfaces/mtkpower/1.0/.hidl-autogen b/interfaces/mtkpower/1.0/.hidl-autogen deleted file mode 100644 index e69de29..0000000 diff --git a/interfaces/mtkpower/1.1/.hidl-autogen b/interfaces/mtkpower/1.1/.hidl-autogen deleted file mode 100644 index e69de29..0000000 diff --git a/interfaces/mtkpower/1.2/.hidl-autogen b/interfaces/mtkpower/1.2/.hidl-autogen deleted file mode 100644 index e69de29..0000000 diff --git a/interfaces/updates-makefiles.sh b/interfaces/updates-makefiles.sh index b6a3982..4e27131 100755 --- a/interfaces/updates-makefiles.sh +++ b/interfaces/updates-makefiles.sh @@ -3,4 +3,4 @@ source $ANDROID_BUILD_TOP/system/tools/hidl/update-makefiles-helper.sh do_makefiles_update \ - "vendor.mediatek.hardware.mtkpower:hardware/mediatek/interfaces/mtkpower" + "vendor.mediatek.hardware:hardware/mediatek/interfaces/hardware"