diff options
| author | Mitch Phillips <31459023+hctim@users.noreply.github.com> | 2023-01-17 21:31:20 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-01-17 21:31:20 +0000 |
| commit | 0bcf1e48ec19df03628c9ec428d2f124c9f249d2 (patch) | |
| tree | d4435e03156e35f94ffa1595019b1fea445d65e0 | |
| parent | e5a56ce4f69dff657131a3983acc0d4102acf6ca (diff) | |
| parent | ac63f4128494fdcbc967bc76de95f6e4347ae7f7 (diff) | |
| download | gwp_asan-0bcf1e48ec19df03628c9ec428d2f124c9f249d2.tar.gz | |
Revert "[GWP-ASan] Fix 6413872" am: eaa515a8b1 am: ac63f41284
Original change: https://android-review.googlesource.com/c/platform/external/gwp_asan/+/2389782
Change-Id: I8cac17f3323fb8127035ad53c9e5e5327b911779
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | gwp_asan/tests/harness.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gwp_asan/tests/harness.h b/gwp_asan/tests/harness.h index efac826..e6be68c 100644 --- a/gwp_asan/tests/harness.h +++ b/gwp_asan/tests/harness.h @@ -18,7 +18,7 @@ template <typename T> using TestWithParam = ::zxtest::TestWithParam<T>; #else #include "gtest/gtest.h" using Test = ::testing::Test; -template <typename T> using TestWithParam = ::testing::TestWithParam<T>; +template <typename T> using TestWithParam = ::zxtest::TestWithParam<T>; #endif #include "gwp_asan/guarded_pool_allocator.h" |