commit ce6cdc8e16bbed03a6f90c580d53a1883cd69dab
author Maciej Żenczykowski <maze@google.com> Fri Jun 17 04:44:33 2022 -0700
committer Maciej Żenczykowski <maze@google.com> Tue Jun 21 03:49:46 2022 +0000
tree ef93c01fd8e27d85ffe0123da7d47b45bca0a087
parent bda7ced5be44b64cfb10bcb48e32ad2d03829a82

adjust for newly added bpf map/prog definition fields in T+

This is needed due to BpfLoader v0.18 supporting more
functionality and thus bpf code compilation by default using
larger structs than it did during S.

Bug: 218408035
Test: booted on cuttlefish, atest CtsNativeNetTestCases
OBSigned-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I0a37e59760fb0b55e6d6a6d12d5fd40106accd55
(cherry picked from commit b95db2808073beae71d41e07e2e1c3e6581c7d65)
Merged-In: I0a37e59760fb0b55e6d6a6d12d5fd40106accd55

tests/cts/net/native/src/BpfCompatTest.cpp

diff --git a/tests/cts/net/native/src/BpfCompatTest.cpp b/tests/cts/net/native/src/BpfCompatTest.cpp
index 97ecb9e..e52533b 100644
--- a/tests/cts/net/native/src/BpfCompatTest.cpp
+++ b/tests/cts/net/native/src/BpfCompatTest.cpp
@@ -31,8 +31,13 @@
   std::ifstream elfFile(elfPath, std::ios::in | std::ios::binary);
   ASSERT_TRUE(elfFile.is_open());
 
-  EXPECT_EQ(48, readSectionUint("size_of_bpf_map_def", elfFile, 0));
-  EXPECT_EQ(28, readSectionUint("size_of_bpf_prog_def", elfFile, 0));
+  if (android::modules::sdklevel::IsAtLeastT()) {
+    EXPECT_EQ(116, readSectionUint("size_of_bpf_map_def", elfFile, 0));
+    EXPECT_EQ(92, readSectionUint("size_of_bpf_prog_def", elfFile, 0));
+  } else {
+    EXPECT_EQ(48, readSectionUint("size_of_bpf_map_def", elfFile, 0));
+    EXPECT_EQ(28, readSectionUint("size_of_bpf_prog_def", elfFile, 0));
+  }
 }
 
 TEST(BpfTest, bpfStructSizeTestPreT) {