Rename time_in_state.o to timeInState.o
Underscore character may cause bpf prog/map naming collision. For
example, x.o with map y_z and x_y.o with map z both result in x_y_z
prog/map name, which should be prevented during compile-time.
aosp/2147825 will prohibit underscore character in bpf source name
(source name derives the obj name). Existing bpf modules with underscore
characters in source name need to be updated accordingly.
Bug: 236706995
Test: adb root; adb shell ls -l /sys/fs/bpf/ | grep timeInState
Test: atest CtsNativeNetTestCases:BpfTest#bpfStructSizeTest
Change-Id: Ic1ded563b8d42ecde3d32a27130f9f01a89c8572
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) {