commit 43cfb1c6fb23d1e2a65f08197907104675fe6613
author Ken Chen <cken@google.com> Thu Jul 21 13:43:50 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jul 21 13:43:50 2022 +0000
tree 9c390387dc743c9cab16c345fa36ddcab5fc5adb
parent 95f801a104127fc75a4cbf1dcd4bb8edca0db2c7
parent e8bc25759726d40f4a3a00e511f44f99cb6b1bbe

Merge changes from topics "gpuMem", "timeInState"

* changes:
  Rename time_in_state.o to timeInState.o
  Rename gpu_mem.o to gpuMem.o

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 e52533b..3aec4c7 100644
--- a/tests/cts/net/native/src/BpfCompatTest.cpp
+++ b/tests/cts/net/native/src/BpfCompatTest.cpp
@@ -47,8 +47,13 @@
 }
 
 TEST(BpfTest, bpfStructSizeTest) {
-  doBpfStructSizeTest("/system/etc/bpf/gpu_mem.o");
-  doBpfStructSizeTest("/system/etc/bpf/time_in_state.o");
+  if (android::modules::sdklevel::IsAtLeastU()) {
+      doBpfStructSizeTest("/system/etc/bpf/gpuMem.o");
+      doBpfStructSizeTest("/system/etc/bpf/timeInState.o");
+  } else {
+      doBpfStructSizeTest("/system/etc/bpf/gpu_mem.o");
+      doBpfStructSizeTest("/system/etc/bpf/time_in_state.o");
+  }
 }
 
 int main(int argc, char **argv) {