| commit | b3a5c66d4c4bbd3edd2230d00e79364623ee8f5e | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Sat Mar 04 08:27:11 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Mar 04 08:27:11 2023 +0000 |
| tree | 7e28387fe48a7d67c30e240501c02fd05b2cf990 | |
| parent | 1f85dc7212d8fc42db45eb26e504e996eada21f3 [diff] | |
| parent | da5022e6f5bbdbf78e895e4436bc353419e412ec [diff] |
Merge "Do not include internal GTest header." am: 1a6e2031fc am: 453240f61f am: da5022e6f5 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2469730 Change-Id: I36f5c75a6e053144acceabb88da92b135c9bdef4 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 {