commit 4845124ade94aedc3e226ee353d61666cc33f2d9
author Treehugger Robot <treehugger-gerrit@google.com> Fri Jul 22 00:14:37 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jul 22 00:14:37 2022 +0000
tree 4757fefb7cf92428b3745c90a819d82e23c39d8e
parent 186f683a01de2177b67ba42ef3fa4b066314e7d2
parent 0bf7fa93557303c595f67a799042e221e4687944

Merge "support bpf_map_def struct size increase to fix map uid != AID_ROOT" am: 0bf7fa9355

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2162296

Change-Id: I63bb9e81bc4717cd8ac597d5ece6ca88aa4714d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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 {