commit d5cd048c72cedd7da94c9ef38a89887ef6d4bc7c
author Yifan Hong <elsk@google.com> Mon Jun 19 12:25:48 2017 -0700
committer Yifan Hong <elsk@google.com> Mon Jun 19 12:30:17 2017 -0700
tree cc1882d595b8db0f49698dabc69aaf299980d53f
parent 24a2a1cfd04a6df1a5a3d7b28a074dc8f1d87f45

Add Arch::operator| and operator|=

The OR operator for Arch stacks bitness information.

Test: libvintf_test
Test: lshal --init-vintf

Bug: 62675393
Change-Id: I3fc56b3a39e48c8a2d452f2796123fca3fc1d4a4
Merged-In: I3fc56b3a39e48c8a2d452f2796123fca3fc1d4a4

test/main.cpp

diff --git a/test/main.cpp b/test/main.cpp
index 5f06a8b..6ce1e23 100644
--- a/test/main.cpp
+++ b/test/main.cpp
@@ -163,6 +163,18 @@
     }
 };
 
+TEST_F(LibVintfTest, ArchOperatorOr) {
+    Arch a = Arch::ARCH_EMPTY;
+    a |= Arch::ARCH_32;
+    EXPECT_EQ(Arch::ARCH_32, a);
+
+    a |= Arch::ARCH_64;
+    EXPECT_EQ(Arch::ARCH_32_64, a);
+
+    a = Arch::ARCH_EMPTY;
+    a |= Arch::ARCH_64;
+    EXPECT_EQ(Arch::ARCH_64, a);
+}
 
 TEST_F(LibVintfTest, Stringify) {
     HalManifest vm = testDeviceManifest();