Remove <impl> tag from ManifestHal.
It is deprecated as suggested by documentation.
Test: libvintf_test
Bug: 36602724
Change-Id: Ifc847f87f654b0c62dba6106ae5b19c9c2d87f30
diff --git a/test/main.cpp b/test/main.cpp
index ef52d13..61b6bd9 100644
--- a/test/main.cpp
+++ b/test/main.cpp
@@ -33,7 +33,6 @@
extern const XmlConverter<ManifestHal> &gManifestHalConverter;
extern const XmlConverter<MatrixHal> &gMatrixHalConverter;
extern const XmlConverter<KernelConfigTypedValue> &gKernelConfigTypedValueConverter;
-extern const XmlConverter<HalImplementation> &gHalImplementationConverter;
extern const XmlConverter<HalManifest> &gHalManifestConverter;
extern const XmlConverter<CompatibilityMatrix> &gCompatibilityMatrixConverter;
@@ -73,7 +72,6 @@
.format = HalFormat::HIDL,
.name = "android.hardware.camera",
.versions = {Version(2, 0)},
- .impl = HalImplementation{ImplLevel::SOC, "msm8892"},
.transportArch = {Transport::HWBINDER, Arch::ARCH_EMPTY},
.interfaces = {
{"ICamera", {"ICamera", {"legacy/0", "default"}}},
@@ -84,7 +82,6 @@
.format = HalFormat::HIDL,
.name = "android.hardware.nfc",
.versions = {Version(1, 0)},
- .impl = HalImplementation{ImplLevel::GENERIC, "generic"},
.transportArch = {Transport::PASSTHROUGH, Arch::ARCH_32_64},
.interfaces = {
{"INfc", {"INfc", {"default"}}}
@@ -116,8 +113,8 @@
TEST_F(LibVintfTest, Stringify) {
HalManifest vm = testHalManifest();
- EXPECT_EQ(dump(vm), "hidl/android.hardware.camera/hwbinder/soc/msm8892/2.0:"
- "hidl/android.hardware.nfc/passthrough32+64/generic/generic/1.0");
+ EXPECT_EQ(dump(vm), "hidl/android.hardware.camera/hwbinder/2.0:"
+ "hidl/android.hardware.nfc/passthrough32+64/1.0");
EXPECT_EQ(to_string(HalFormat::HIDL), "hidl");
EXPECT_EQ(to_string(HalFormat::NATIVE), "native");
@@ -137,7 +134,6 @@
" <hal format=\"hidl\">\n"
" <name>android.hardware.camera</name>\n"
" <transport>hwbinder</transport>\n"
- " <impl level=\"soc\">msm8892</impl>\n"
" <version>2.0</version>\n"
" <interface>\n"
" <name>IBetterCamera</name>\n"
@@ -152,7 +148,6 @@
" <hal format=\"hidl\">\n"
" <name>android.hardware.nfc</name>\n"
" <transport arch=\"32+64\">passthrough</transport>\n"
- " <impl level=\"generic\">generic</impl>\n"
" <version>1.0</version>\n"
" <interface>\n"
" <name>INfc</name>\n"
@@ -162,21 +157,6 @@
"</manifest>\n");
}
-TEST_F(LibVintfTest, EmptyImpl) {
- EXPECT_EQ(gManifestHalConverter(
- ManifestHal{
- .format = HalFormat::HIDL,
- .name = "android.hidl.manager",
- .impl = HalImplementation{},
- .transportArch = {Transport::HWBINDER, Arch::ARCH_EMPTY},
- }),
- "<hal format=\"hidl\">\n"
- " <name>android.hidl.manager</name>\n"
- " <transport>hwbinder</transport>\n"
- "</hal>\n"
- ) << "HalImplementation should be missing.";
-}
-
TEST_F(LibVintfTest, HalManifestOptional) {
HalManifest vm;
EXPECT_TRUE(gHalManifestConverter(&vm,
@@ -230,16 +210,6 @@
EXPECT_EQ(v, v2);
}
-TEST_F(LibVintfTest, HalImplementationConverter) {
- HalImplementation hl{ImplLevel::SOC, "msm8992"};
- std::string xml = gHalImplementationConverter(hl);
- EXPECT_EQ(xml, "<impl level=\"soc\">msm8992</impl>\n");
- HalImplementation hl2;
- EXPECT_TRUE(gHalImplementationConverter(&hl2, xml));
- EXPECT_EQ(hl.impl, hl2.impl);
- EXPECT_EQ(hl.implLevel, hl2.implLevel);
-}
-
TEST_F(LibVintfTest, MatrixHalConverter) {
MatrixHal mh{HalFormat::NATIVE, "android.hardware.camera",
{{VersionRange(1,2,3), VersionRange(4,5,6)}},
@@ -403,7 +373,6 @@
.format = HalFormat::HIDL,
.name = "android.hardware.camera",
.versions = {{Version(2, 0), Version(2, 1)}},
- .impl = HalImplementation{ImplLevel::SOC, "msm8892"},
.transportArch = {Transport::PASSTHROUGH, Arch::ARCH_32_64}
};