| commit | 33996c9495aded4dde7fc88992596e879d335cd3 | [log] [tgz] |
|---|---|---|
| author | Ken Chen <cken@google.com> | Thu Jul 21 22:21:49 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jul 21 22:21:49 2022 +0000 |
| tree | 74a65b9bae84be9d04569be351afe8bfdc8bc6dc | |
| parent | 5e6754bc1dbb4b3f40a3477b96c67cba1b4fe24f [diff] | |
| parent | 43cfb1c6fb23d1e2a65f08197907104675fe6613 [diff] |
Merge changes from topics "gpuMem", "timeInState" am: 43cfb1c6fb Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2149415 Change-Id: I6df7f4b99847dcc2ec5f87015b6bdc17011e7199 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/tests/cts/net/native/src/BpfCompatTest.cpp b/tests/cts/net/native/src/BpfCompatTest.cpp index f54ec29..3aec4c7 100644 --- a/tests/cts/net/native/src/BpfCompatTest.cpp +++ b/tests/cts/net/native/src/BpfCompatTest.cpp
@@ -49,10 +49,11 @@ TEST(BpfTest, bpfStructSizeTest) { 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"); } - doBpfStructSizeTest("/system/etc/bpf/time_in_state.o"); } int main(int argc, char **argv) {