From 1bb66f6898a416ccb7a85d8f1e96f05ff565fe05 Mon Sep 17 00:00:00 2001 From: Bruno Martins Date: Fri, 4 Mar 2022 16:19:18 +0000 Subject: [PATCH] interfaces: Split between vendors This should make updates-makefiles.sh usable. Change-Id: I118fcb1bcbed290eb894f92c058269189f2dde84 --- interfaces/Android.bp | 8 ++++---- .../hardware/biometrics/fingerprint/2.1/Android.bp | 0 .../fingerprint/2.1/IGoodixFingerprintDaemon.hal | 0 .../fingerprint/2.1/IGoodixFingerprintDaemonCallback.hal | 0 interfaces/updates-makefiles.sh | 5 ++++- .../{ => xiaomi}/hardware/displayfeature/1.0/Android.bp | 0 .../hardware/displayfeature/1.0/IDisplayFeature.hal | 0 .../hardware/fingerprintextension/1.0/Android.bp | 0 .../fingerprintextension/1.0/IXiaomiFingerprint.hal | 0 interfaces/{ => xiaomi}/hardware/motor/1.0/Android.bp | 0 interfaces/{ => xiaomi}/hardware/motor/1.0/IMotor.hal | 0 .../{ => xiaomi}/hardware/motor/1.0/IMotorCallback.hal | 0 interfaces/{ => xiaomi}/hardware/motor/1.0/types.hal | 0 .../{ => xiaomi}/hardware/touchfeature/1.0/Android.bp | 0 .../hardware/touchfeature/1.0/ITouchFeature.hal | 0 15 files changed, 8 insertions(+), 5 deletions(-) rename interfaces/{ => goodix}/hardware/biometrics/fingerprint/2.1/Android.bp (100%) rename interfaces/{ => goodix}/hardware/biometrics/fingerprint/2.1/IGoodixFingerprintDaemon.hal (100%) rename interfaces/{ => goodix}/hardware/biometrics/fingerprint/2.1/IGoodixFingerprintDaemonCallback.hal (100%) rename interfaces/{ => xiaomi}/hardware/displayfeature/1.0/Android.bp (100%) rename interfaces/{ => xiaomi}/hardware/displayfeature/1.0/IDisplayFeature.hal (100%) rename interfaces/{ => xiaomi}/hardware/fingerprintextension/1.0/Android.bp (100%) rename interfaces/{ => xiaomi}/hardware/fingerprintextension/1.0/IXiaomiFingerprint.hal (100%) rename interfaces/{ => xiaomi}/hardware/motor/1.0/Android.bp (100%) rename interfaces/{ => xiaomi}/hardware/motor/1.0/IMotor.hal (100%) rename interfaces/{ => xiaomi}/hardware/motor/1.0/IMotorCallback.hal (100%) rename interfaces/{ => xiaomi}/hardware/motor/1.0/types.hal (100%) rename interfaces/{ => xiaomi}/hardware/touchfeature/1.0/Android.bp (100%) rename interfaces/{ => xiaomi}/hardware/touchfeature/1.0/ITouchFeature.hal (100%) diff --git a/interfaces/Android.bp b/interfaces/Android.bp index 9fd29ce..90998d3 100644 --- a/interfaces/Android.bp +++ b/interfaces/Android.bp @@ -1,9 +1,9 @@ hidl_package_root { - name: "vendor.xiaomi", - path: "hardware/xiaomi/interfaces", + name: "vendor.goodix", + path: "hardware/xiaomi/interfaces/goodix", } hidl_package_root { - name: "vendor.goodix", - path: "hardware/xiaomi/interfaces", + name: "vendor.xiaomi", + path: "hardware/xiaomi/interfaces/xiaomi", } diff --git a/interfaces/hardware/biometrics/fingerprint/2.1/Android.bp b/interfaces/goodix/hardware/biometrics/fingerprint/2.1/Android.bp similarity index 100% rename from interfaces/hardware/biometrics/fingerprint/2.1/Android.bp rename to interfaces/goodix/hardware/biometrics/fingerprint/2.1/Android.bp diff --git a/interfaces/hardware/biometrics/fingerprint/2.1/IGoodixFingerprintDaemon.hal b/interfaces/goodix/hardware/biometrics/fingerprint/2.1/IGoodixFingerprintDaemon.hal similarity index 100% rename from interfaces/hardware/biometrics/fingerprint/2.1/IGoodixFingerprintDaemon.hal rename to interfaces/goodix/hardware/biometrics/fingerprint/2.1/IGoodixFingerprintDaemon.hal diff --git a/interfaces/hardware/biometrics/fingerprint/2.1/IGoodixFingerprintDaemonCallback.hal b/interfaces/goodix/hardware/biometrics/fingerprint/2.1/IGoodixFingerprintDaemonCallback.hal similarity index 100% rename from interfaces/hardware/biometrics/fingerprint/2.1/IGoodixFingerprintDaemonCallback.hal rename to interfaces/goodix/hardware/biometrics/fingerprint/2.1/IGoodixFingerprintDaemonCallback.hal diff --git a/interfaces/updates-makefiles.sh b/interfaces/updates-makefiles.sh index cc6b9eb..f41e126 100755 --- a/interfaces/updates-makefiles.sh +++ b/interfaces/updates-makefiles.sh @@ -3,4 +3,7 @@ source $ANDROID_BUILD_TOP/system/tools/hidl/update-makefiles-helper.sh do_makefiles_update \ - "vendor.xiaomi:hardware/xiaomi/interfaces" + "vendor.goodix:hardware/xiaomi/interfaces/goodix" + +do_makefiles_update \ + "vendor.xiaomi:hardware/xiaomi/interfaces/xiaomi" diff --git a/interfaces/hardware/displayfeature/1.0/Android.bp b/interfaces/xiaomi/hardware/displayfeature/1.0/Android.bp similarity index 100% rename from interfaces/hardware/displayfeature/1.0/Android.bp rename to interfaces/xiaomi/hardware/displayfeature/1.0/Android.bp diff --git a/interfaces/hardware/displayfeature/1.0/IDisplayFeature.hal b/interfaces/xiaomi/hardware/displayfeature/1.0/IDisplayFeature.hal similarity index 100% rename from interfaces/hardware/displayfeature/1.0/IDisplayFeature.hal rename to interfaces/xiaomi/hardware/displayfeature/1.0/IDisplayFeature.hal diff --git a/interfaces/hardware/fingerprintextension/1.0/Android.bp b/interfaces/xiaomi/hardware/fingerprintextension/1.0/Android.bp similarity index 100% rename from interfaces/hardware/fingerprintextension/1.0/Android.bp rename to interfaces/xiaomi/hardware/fingerprintextension/1.0/Android.bp diff --git a/interfaces/hardware/fingerprintextension/1.0/IXiaomiFingerprint.hal b/interfaces/xiaomi/hardware/fingerprintextension/1.0/IXiaomiFingerprint.hal similarity index 100% rename from interfaces/hardware/fingerprintextension/1.0/IXiaomiFingerprint.hal rename to interfaces/xiaomi/hardware/fingerprintextension/1.0/IXiaomiFingerprint.hal diff --git a/interfaces/hardware/motor/1.0/Android.bp b/interfaces/xiaomi/hardware/motor/1.0/Android.bp similarity index 100% rename from interfaces/hardware/motor/1.0/Android.bp rename to interfaces/xiaomi/hardware/motor/1.0/Android.bp diff --git a/interfaces/hardware/motor/1.0/IMotor.hal b/interfaces/xiaomi/hardware/motor/1.0/IMotor.hal similarity index 100% rename from interfaces/hardware/motor/1.0/IMotor.hal rename to interfaces/xiaomi/hardware/motor/1.0/IMotor.hal diff --git a/interfaces/hardware/motor/1.0/IMotorCallback.hal b/interfaces/xiaomi/hardware/motor/1.0/IMotorCallback.hal similarity index 100% rename from interfaces/hardware/motor/1.0/IMotorCallback.hal rename to interfaces/xiaomi/hardware/motor/1.0/IMotorCallback.hal diff --git a/interfaces/hardware/motor/1.0/types.hal b/interfaces/xiaomi/hardware/motor/1.0/types.hal similarity index 100% rename from interfaces/hardware/motor/1.0/types.hal rename to interfaces/xiaomi/hardware/motor/1.0/types.hal diff --git a/interfaces/hardware/touchfeature/1.0/Android.bp b/interfaces/xiaomi/hardware/touchfeature/1.0/Android.bp similarity index 100% rename from interfaces/hardware/touchfeature/1.0/Android.bp rename to interfaces/xiaomi/hardware/touchfeature/1.0/Android.bp diff --git a/interfaces/hardware/touchfeature/1.0/ITouchFeature.hal b/interfaces/xiaomi/hardware/touchfeature/1.0/ITouchFeature.hal similarity index 100% rename from interfaces/hardware/touchfeature/1.0/ITouchFeature.hal rename to interfaces/xiaomi/hardware/touchfeature/1.0/ITouchFeature.hal