axolotl: lights: fix VTS
- Drop the manifest entry for the AIDL extension
- Drop HIDL manifest entry
- Upgrade aidl implementation to V2
- Explicitly set version to AIDL VINTF entries
- Run custom VTS test against lights HAL and not its extension
Test: atest SHIFTVtsHalLightTargetTest
Test: run vts -m vts_treble_vintf_vendor_test
Test: run vts -m VtsHalLightV2_0TargetTest
Change-Id: I6e1384bcf57069f45f70a12f117f451c9a98cc6f
Signed-off-by: Alexander Martinz <amartinz@shiftphones.com>
diff --git a/interfaces/light/aidl/default/Android.bp b/interfaces/light/aidl/default/Android.bp
index f468191..abdd352 100644
--- a/interfaces/light/aidl/default/Android.bp
+++ b/interfaces/light/aidl/default/Android.bp
@@ -18,7 +18,7 @@
shared_libs: [
"libbase",
"libbinder_ndk",
- "android.hardware.light-V1-ndk",
+ "android.hardware.light-V2-ndk",
"hardware.shift.light-V1-ndk",
],
product_variables: {
diff --git a/interfaces/light/aidl/default/hardware.shift.light-service.default.xml b/interfaces/light/aidl/default/hardware.shift.light-service.default.xml
index 819242b..abdd74e 100644
--- a/interfaces/light/aidl/default/hardware.shift.light-service.default.xml
+++ b/interfaces/light/aidl/default/hardware.shift.light-service.default.xml
@@ -1,10 +1,7 @@
<manifest version="1.0" type="device">
<hal format="aidl">
<name>android.hardware.light</name>
- <fqname>ILights/default</fqname>
- </hal>
- <hal format="aidl">
- <name>hardware.shift.light</name>
+ <version>2</version>
<fqname>ILights/default</fqname>
</hal>
</manifest>
diff --git a/interfaces/light/aidl/vts/functional/Android.bp b/interfaces/light/aidl/vts/functional/Android.bp
index 986bf8f..b0b72c4 100644
--- a/interfaces/light/aidl/vts/functional/Android.bp
+++ b/interfaces/light/aidl/vts/functional/Android.bp
@@ -19,7 +19,7 @@
"libutils",
],
static_libs: [
- "android.hardware.light-V1-ndk",
+ "android.hardware.light-V2-ndk",
"hardware.shift.light-V1-ndk",
],
test_suites: [
diff --git a/interfaces/light/aidl/vts/functional/SHIFTVtsHalLightTargetTest.cpp b/interfaces/light/aidl/vts/functional/SHIFTVtsHalLightTargetTest.cpp
index 6d6e080..8cb5123 100644
--- a/interfaces/light/aidl/vts/functional/SHIFTVtsHalLightTargetTest.cpp
+++ b/interfaces/light/aidl/vts/functional/SHIFTVtsHalLightTargetTest.cpp
@@ -133,7 +133,7 @@
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(SHIFT_LightsAidl);
INSTANTIATE_TEST_SUITE_P(SHIFT_Lights, SHIFT_LightsAidl,
- testing::ValuesIn(android::getAidlHalInstanceNames(ILightsExt::descriptor)),
+ testing::ValuesIn(android::getAidlHalInstanceNames(ILights::descriptor)),
android::PrintInstanceNameToString);
int main(int argc, char** argv) {
diff --git a/vintf/manifest.xml b/vintf/manifest.xml
index a947ae6..c289a0d 100644
--- a/vintf/manifest.xml
+++ b/vintf/manifest.xml
@@ -114,15 +114,6 @@
</interface>
</hal>
<hal format="hidl">
- <name>android.hardware.light</name>
- <transport>hwbinder</transport>
- <version>2.0</version>
- <interface>
- <name>ILight</name>
- <instance>default</instance>
- </interface>
- </hal>
- <hal format="hidl">
<name>android.hardware.media.omx</name>
<transport>hwbinder</transport>
<version>1.0</version>