Merge "Clean up global g*FormatStrings." am: fa5d4b2395
Original change: https://android-review.googlesource.com/c/platform/system/libvintf/+/1912640
Change-Id: I6efd2ea72e6c1302caab70cc1baa7086e8695a0a
diff --git a/include/vintf/Arch.h b/include/vintf/Arch.h
index 3e69a42..4f4ae6a 100644
--- a/include/vintf/Arch.h
+++ b/include/vintf/Arch.h
@@ -32,7 +32,7 @@
ARCH_32_64
};
-static const std::array<std::string, 4> gArchStrings = {
+static constexpr std::array<const char*, 4> gArchStrings = {
{
"",
"32",
diff --git a/include/vintf/HalFormat.h b/include/vintf/HalFormat.h
index fc86133..3774098 100644
--- a/include/vintf/HalFormat.h
+++ b/include/vintf/HalFormat.h
@@ -32,7 +32,7 @@
};
// clang-format off
-static const std::array<std::string, 3> gHalFormatStrings = {
+static constexpr std::array<const char*, 3> gHalFormatStrings = {
"hidl",
"native",
"aidl"
diff --git a/include/vintf/KernelConfigType.h b/include/vintf/KernelConfigType.h
index de22c21..ffb203e 100644
--- a/include/vintf/KernelConfigType.h
+++ b/include/vintf/KernelConfigType.h
@@ -31,7 +31,7 @@
TRISTATE
};
-static const std::array<std::string, 4> gKernelConfigTypeStrings = {
+static constexpr std::array<const char*, 4> gKernelConfigTypeStrings = {
{
"string",
"int",
diff --git a/include/vintf/SchemaType.h b/include/vintf/SchemaType.h
index 4254957..8a68150 100644
--- a/include/vintf/SchemaType.h
+++ b/include/vintf/SchemaType.h
@@ -29,7 +29,7 @@
FRAMEWORK,
};
-static const std::array<std::string, 2> gSchemaTypeStrings = {
+static constexpr std::array<const char*, 2> gSchemaTypeStrings = {
{
"device",
"framework",
diff --git a/include/vintf/Tristate.h b/include/vintf/Tristate.h
index f600b4c..5417b23 100644
--- a/include/vintf/Tristate.h
+++ b/include/vintf/Tristate.h
@@ -30,7 +30,7 @@
MODULE
};
-static const std::array<std::string, 3> gTristateStrings = {
+static constexpr std::array<const char*, 3> gTristateStrings = {
{
"n",
"y",
diff --git a/include/vintf/XmlSchemaFormat.h b/include/vintf/XmlSchemaFormat.h
index 32a42b6..e75771e 100644
--- a/include/vintf/XmlSchemaFormat.h
+++ b/include/vintf/XmlSchemaFormat.h
@@ -28,7 +28,7 @@
XSD,
};
-static const std::array<std::string, 2> gXmlSchemaFormatStrings = {{
+static constexpr std::array<const char*, 2> gXmlSchemaFormatStrings = {{
"dtd", "xsd",
}};
