| commit | 3cb16a46c6934338ce3906a56972f1ecf86d4d9c | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Fri Jun 17 23:01:57 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jun 17 23:01:57 2022 +0000 |
| tree | a39fc4fdf04c05e3e575f9aa3cce6810c25ee25c | |
| parent | 45ee8294655fe773fdc17fbd8aed93625d86a596 [diff] | |
| parent | 1ad532a7cc38ed81abd3e33ed976219551af838b [diff] |
Merge "GpuMem(Tracer)Test - define BPF_MAP_MAKE_VISIBLE_FOR_TESTING" am: 939a6e8404 am: 4c2b547d7e am: 8849f4b784 am: 4fa69a3443 am: 1ad532a7cc Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2128448 Change-Id: I5890c30df27facf49932503036289d3de2ec9274 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/services/gpuservice/tests/unittests/GpuMemTest.cpp b/services/gpuservice/tests/unittests/GpuMemTest.cpp index 2c19c24..36ae179 100644 --- a/services/gpuservice/tests/unittests/GpuMemTest.cpp +++ b/services/gpuservice/tests/unittests/GpuMemTest.cpp
@@ -18,6 +18,7 @@ #define LOG_TAG "gpuservice_unittest" #include <android-base/stringprintf.h> +#define BPF_MAP_MAKE_VISIBLE_FOR_TESTING #include <bpf/BpfMap.h> #include <gmock/gmock.h> #include <gpumem/GpuMem.h>
diff --git a/services/gpuservice/tests/unittests/GpuMemTracerTest.cpp b/services/gpuservice/tests/unittests/GpuMemTracerTest.cpp index b7d2b86..5c04210 100644 --- a/services/gpuservice/tests/unittests/GpuMemTracerTest.cpp +++ b/services/gpuservice/tests/unittests/GpuMemTracerTest.cpp
@@ -17,6 +17,7 @@ #undef LOG_TAG #define LOG_TAG "gpuservice_unittest" +#define BPF_MAP_MAKE_VISIBLE_FOR_TESTING #include <bpf/BpfMap.h> #include <gpumem/GpuMem.h> #include <gtest/gtest.h>