| commit | 453240f61f947112419b9b8874134cfe621b36a3 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Sat Mar 04 06:45:25 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Mar 04 06:45:25 2023 +0000 |
| tree | 216eef6b302c408bf660568d8f1e6dc998b0f112 | |
| parent | f0fb395c98d210332ac2fd143173cd0073ed614b [diff] | |
| parent | 1a6e2031fc8222c925149834b82a6209aeeea90f [diff] |
Merge "Do not include internal GTest header." am: 1a6e2031fc Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2469730 Change-Id: I5d2cfbee355fd2e11a81cd0825a91634f815704f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/audio/aidl/vts/EffectHelper.h b/audio/aidl/vts/EffectHelper.h index 5ed8e1f..5e03d67 100644 --- a/audio/aidl/vts/EffectHelper.h +++ b/audio/aidl/vts/EffectHelper.h
@@ -28,6 +28,7 @@ #include <aidl/android/media/audio/common/AudioChannelLayout.h> #include <android/binder_auto_utils.h> #include <fmq/AidlMessageQueue.h> +#include <gtest/gtest.h> #include <system/audio_effects/aidl_effects_utils.h> #include "AudioHalBinderServiceUtil.h"
diff --git a/audio/aidl/vts/TestUtils.h b/audio/aidl/vts/TestUtils.h index 4c1d42c..72ca56f 100644 --- a/audio/aidl/vts/TestUtils.h +++ b/audio/aidl/vts/TestUtils.h
@@ -21,7 +21,7 @@ #include <iostream> #include <android/binder_auto_utils.h> -#include <gtest/gtest_pred_impl.h> +#include <gtest/gtest.h> namespace android::hardware::audio::common::testing {