commit 0bf7fa93557303c595f67a799042e221e4687944
author Treehugger Robot <treehugger-gerrit@google.com> Thu Jul 21 23:52:07 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jul 21 23:52:07 2022 +0000
tree e04dce61f05b4f9eafedefc7fc99fefd6edc094d
parent e6162aca71e8841b184083ebb7fab542019b0d5a
parent 3f2dab48fc97bd4b5f573683442fcf8811900c2f

Merge "support bpf_map_def struct size increase to fix map uid != AID_ROOT"

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 3aec4c7..5c02b0d 100644
--- a/tests/cts/net/native/src/BpfCompatTest.cpp
+++ b/tests/cts/net/native/src/BpfCompatTest.cpp
@@ -31,7 +31,10 @@
   std::ifstream elfFile(elfPath, std::ios::in | std::ios::binary);
   ASSERT_TRUE(elfFile.is_open());
 
-  if (android::modules::sdklevel::IsAtLeastT()) {
+  if (android::modules::sdklevel::IsAtLeastU()) {
+    EXPECT_EQ(120, readSectionUint("size_of_bpf_map_def", elfFile, 0));
+    EXPECT_EQ(92, readSectionUint("size_of_bpf_prog_def", elfFile, 0));
+  } else 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 {