lshal: refactor: Use vintf::Arch instead of enum Architecture
The Architecture enum was invented
when there was no operator| and operator|= implemented
for vintf::Arch. Now that |= is properly defined, it
makes sense to remove duplicated definition of classes.
Test: lshal_test
Change-Id: I5d4786c3a460e20a49b32fa42226294ab2899d20
diff --git a/cmds/lshal/TableEntry.h b/cmds/lshal/TableEntry.h
index 04dfb80..08a1303 100644
--- a/cmds/lshal/TableEntry.h
+++ b/cmds/lshal/TableEntry.h
@@ -24,6 +24,7 @@
#include <iostream>
#include <procpartition/procpartition.h>
+#include <vintf/Arch.h>
#include <vintf/Transport.h>
#include "TextTable.h"
@@ -41,14 +42,6 @@
};
using TableEntrySource = unsigned int;
-enum : unsigned int {
- ARCH_UNKNOWN = 0,
- ARCH32 = 1 << 0,
- ARCH64 = 1 << 1,
- ARCH_BOTH = ARCH32 | ARCH64
-};
-using Architecture = unsigned int;
-
enum class TableColumnType : unsigned int {
INTERFACE_NAME,
TRANSPORT,
@@ -78,7 +71,7 @@
uint64_t serverObjectAddress{NO_PTR};
Pids clientPids{};
std::vector<std::string> clientCmdlines{};
- Architecture arch{ARCH_UNKNOWN};
+ vintf::Arch arch{vintf::Arch::ARCH_EMPTY};
// empty: unknown, all zeros: unreleased, otherwise: released
std::string hash{};
Partition partition{Partition::UNKNOWN};