From c8b1fc25822cbefc25d703f1334f854c77ab831c Mon Sep 17 00:00:00 2001
From: Wan-Teh Chang <[EMAIL REDACTED]>
Date: Thu, 1 Aug 2024 12:09:28 -0700
Subject: [PATCH] Include "gtest/gtest.h" using the shorter path
Rely on the -I or -system compiler option to find "gtest/gtest.h". This
makes it easier to build our tests against a copy of gtest outside the
libaom source tree.
Bug: aomedia:356830476, webm:42330726
Change-Id: I9e2c9302d1ff67471523be24da3d2c047447d7e1
---
test/accounting_test.cc | 2 +-
test/acm_random.h | 2 +-
test/active_map_test.cc | 2 +-
test/allintra_end_to_end_test.cc | 2 +-
test/altref_test.cc | 2 +-
test/aom_image_test.cc | 2 +-
test/aom_integer_test.cc | 2 +-
test/aom_mem_test.cc | 2 +-
test/aq_segment_test.cc | 2 +-
test/arf_freq_test.cc | 2 +-
test/av1_common_int_test.cc | 2 +-
test/av1_config_test.cc | 2 +-
test/av1_convolve_scale_test.cc | 2 +-
test/av1_convolve_test.cc | 4 ++--
test/av1_encoder_parms_get_to_decoder.cc | 2 +-
test/av1_ext_tile_test.cc | 2 +-
test/av1_external_partition_test.cc | 2 +-
test/av1_highbd_iht_test.cc | 2 +-
test/av1_horz_only_frame_superres_test.cc | 2 +-
test/av1_k_means_test.cc | 4 ++--
test/av1_key_value_api_test.cc | 2 +-
test/av1_nn_predict_test.cc | 2 +-
test/av1_quantize_test.cc | 2 +-
test/av1_round_shift_array_test.cc | 2 +-
test/av1_softmax_test.cc | 2 +-
test/av1_txfm_test.h | 2 +-
test/av1_wedge_utils_test.cc | 2 +-
test/avg_test.cc | 2 +-
test/avif_progressive_test.cc | 2 +-
test/binary_codes_test.cc | 2 +-
test/blend_a64_mask_1d_test.cc | 2 +-
test/blend_a64_mask_test.cc | 2 +-
test/block_test.cc | 2 +-
test/boolcoder_test.cc | 2 +-
test/borders_test.cc | 2 +-
test/cdef_test.cc | 2 +-
test/cfl_test.cc | 2 +-
test/cnn_test.cc | 2 +-
test/coding_path_sync.cc | 2 +-
test/comp_avg_pred_test.cc | 2 +-
test/comp_mask_pred_test.cc | 2 +-
test/convolve_test.cc | 2 +-
test/corner_match_test.cc | 2 +-
test/cpu_speed_test.cc | 2 +-
test/datarate_test.cc | 2 +-
test/datarate_test.h | 2 +-
test/decode_api_test.cc | 2 +-
test/decode_multithreaded_test.cc | 2 +-
test/decode_scalability_test.cc | 2 +-
test/decode_test_driver.cc | 2 +-
test/decode_test_driver.h | 2 +-
test/deltaq_mode_test.cc | 2 +-
test/disflow_test.cc | 2 +-
test/divu_small_test.cc | 2 +-
test/dr_prediction_test.cc | 2 +-
test/ec_test.cc | 2 +-
test/encode_api_test.cc | 2 +-
test/encode_perf_test.cc | 2 +-
test/encode_small_width_height_test.cc | 2 +-
test/encode_test_driver.cc | 2 +-
test/encode_test_driver.h | 2 +-
test/encodemb_test.cc | 2 +-
test/encodetxb_test.cc | 2 +-
test/end_to_end_psnr_test.cc | 2 +-
test/end_to_end_qmpsnr_test.cc | 2 +-
test/end_to_end_ssim_test.cc | 2 +-
test/error_block_test.cc | 2 +-
test/error_resilience_test.cc | 2 +-
test/ethread_test.cc | 2 +-
test/fdct4x4_test.cc | 2 +-
test/fft_test.cc | 2 +-
test/film_grain_table_test.cc | 2 +-
test/filterintra_test.cc | 2 +-
test/firstpass_test.cc | 2 +-
test/force_key_frame_test.cc | 2 +-
test/forced_max_frame_width_height_test.cc | 2 +-
test/frame_parallel_enc_test.cc | 2 +-
test/frame_resize_test.cc | 6 +++---
test/frame_size_tests.cc | 2 +-
test/function_equivalence_test.h | 2 +-
test/fwht4x4_test.cc | 2 +-
test/gf_pyr_height_test.cc | 2 +-
test/hadamard_test.cc | 2 +-
test/hash_test.cc | 2 +-
test/hbd_metrics_test.cc | 2 +-
test/hiprec_convolve_test.cc | 2 +-
test/hiprec_convolve_test_util.h | 2 +-
test/horver_correlation_test.cc | 2 +-
test/horz_superres_test.cc | 2 +-
test/intra_edge_test.cc | 2 +-
test/intrabc_test.cc | 2 +-
test/intrapred_test.cc | 2 +-
test/invalid_file_test.cc | 2 +-
test/kf_test.cc | 2 +-
test/level_test.cc | 2 +-
test/log2_test.cc | 2 +-
test/loopfilter_control_test.cc | 2 +-
test/lossless_test.cc | 2 +-
test/lpf_test.cc | 2 +-
test/masked_sad_test.cc | 2 +-
test/masked_variance_test.cc | 2 +-
test/metadata_test.cc | 2 +-
test/minmax_test.cc | 2 +-
test/monochrome_test.cc | 2 +-
test/motion_vector_test.cc | 2 +-
test/mv_cost_test.cc | 2 +-
test/noise_model_test.cc | 2 +-
test/obmc_sad_test.cc | 2 +-
test/obmc_variance_test.cc | 2 +-
test/pickrst_test.cc | 2 +-
test/quant_test.cc | 4 ++--
test/quantize_func_test.cc | 2 +-
test/ratectrl_rtc_test.cc | 4 ++--
test/ratectrl_test.cc | 2 +-
test/rd_test.cc | 2 +-
test/reconinter_test.cc | 2 +-
test/register_state_check.h | 2 +-
test/resize_test.cc | 2 +-
test/rt_end_to_end_test.cc | 2 +-
test/sad_test.cc | 2 +-
test/sb_multipass_test.cc | 2 +-
test/sb_qp_sweep_test.cc | 2 +-
test/scalability_test.cc | 2 +-
test/scan_test.cc | 2 +-
test/screen_content_test.cc | 2 +-
test/segment_binarization_sync.cc | 2 +-
test/selfguided_filter_test.cc | 2 +-
test/sharpness_test.cc | 2 +-
test/simd_impl.h | 4 ++--
test/sse_sum_test.cc | 2 +-
test/still_picture_test.cc | 2 +-
test/subtract_test.cc | 2 +-
test/sum_squares_test.cc | 2 +-
test/svc_datarate_test.cc | 2 +-
test/temporal_filter_test.cc | 2 +-
test/test_aom_rc.cc | 2 +-
test/test_intra_pred_speed.cc | 2 +-
test/test_libaom.cc | 2 +-
test/test_vector_test.cc | 2 +-
test/tile_config_test.cc | 2 +-
test/tile_independence_test.cc | 2 +-
test/time_stamp_test.cc | 2 +-
test/tpl_model_test.cc | 2 +-
test/transform_test_base.h | 2 +-
test/util.h | 2 +-
test/variance_test.cc | 2 +-
test/video_source.h | 2 +-
test/warp_filter_test.cc | 2 +-
test/warp_filter_test_util.h | 2 +-
test/webmenc_test.cc | 2 +-
test/wiener_test.cc | 2 +-
test/y4m_test.cc | 2 +-
152 files changed, 159 insertions(+), 159 deletions(-)
diff --git a/test/accounting_test.cc b/test/accounting_test.cc
index a861c59026..2c90a67b8a 100644
--- a/test/accounting_test.cc
+++ b/test/accounting_test.cc
@@ -13,7 +13,7 @@
#include <stdlib.h>
#include <string.h>
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
#include "test/acm_random.h"
#include "aom/aom_integer.h"
diff --git a/test/acm_random.h b/test/acm_random.h
index 56b229e0e6..6fb6d566ae 100644
--- a/test/acm_random.h
+++ b/test/acm_random.h
@@ -12,7 +12,7 @@
#ifndef AOM_TEST_ACM_RANDOM_H_
#define AOM_TEST_ACM_RANDOM_H_
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
#include "aom/aom_integer.h"
diff --git a/test/active_map_test.cc b/test/active_map_test.cc
index b9c44c13b6..fd5d61916b 100644
--- a/test/active_map_test.cc
+++ b/test/active_map_test.cc
@@ -11,7 +11,7 @@
#include <climits>
#include <vector>
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
#include "test/codec_factory.h"
#include "test/encode_test_driver.h"
#include "test/i420_video_source.h"
diff --git a/test/allintra_end_to_end_test.cc b/test/allintra_end_to_end_test.cc
index c234cb54c3..e588f610a1 100644
--- a/test/allintra_end_to_end_test.cc
+++ b/test/allintra_end_to_end_test.cc
@@ -12,7 +12,7 @@
#include <memory>
#include <ostream>
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
#include "test/codec_factory.h"
#include "test/encode_test_driver.h"
diff --git a/test/altref_test.cc b/test/altref_test.cc
index ea5f302a6b..354a5a8b63 100644
--- a/test/altref_test.cc
+++ b/test/altref_test.cc
@@ -9,7 +9,7 @@
* PATENTS file, you can obtain it at www.aomedia.org/license/patent.
*/
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
#include "test/codec_factory.h"
#include "test/encode_test_driver.h"
#include "test/i420_video_source.h"
diff --git a/test/aom_image_test.cc b/test/aom_image_test.cc
index d9727911d6..5976061fa9 100644
--- a/test/aom_image_test.cc
+++ b/test/aom_image_test.cc
@@ -12,7 +12,7 @@
#include <climits>
#include "aom/aom_image.h"
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
TEST(AomImageTest, AomImgWrapInvalidAlign) {
const int kWidth = 128;
diff --git a/test/aom_integer_test.cc b/test/aom_integer_test.cc
index 43dbbd03e7..0092a8d821 100644
--- a/test/aom_integer_test.cc
+++ b/test/aom_integer_test.cc
@@ -10,7 +10,7 @@
*/
#include "aom/aom_integer.h"
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
namespace {
const uint64_t kMaximumLeb128CodedSize = 8;
diff --git a/test/aom_mem_test.cc b/test/aom_mem_test.cc
index be0be00e73..2496342940 100644
--- a/test/aom_mem_test.cc
+++ b/test/aom_mem_test.cc
@@ -14,7 +14,7 @@
#include <cstdio>
#include <cstddef>
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
TEST(AomMemTest, Overflow) {
// Allocations are aligned > 1 so SIZE_MAX should always fail.
diff --git a/test/aq_segment_test.cc b/test/aq_segment_test.cc
index f97bad274f..9e8e42d022 100644
--- a/test/aq_segment_test.cc
+++ b/test/aq_segment_test.cc
@@ -11,7 +11,7 @@
#include "config/aom_config.h"
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
#include "test/codec_factory.h"
#include "test/encode_test_driver.h"
#include "test/i420_video_source.h"
diff --git a/test/arf_freq_test.cc b/test/arf_freq_test.cc
index b38f038c7a..1236ce2577 100644
--- a/test/arf_freq_test.cc
+++ b/test/arf_freq_test.cc
@@ -11,7 +11,7 @@
#include <memory>
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
#include "test/codec_factory.h"
#include "test/encode_test_driver.h"
diff --git a/test/av1_common_int_test.cc b/test/av1_common_int_test.cc
index fb8a6b0d23..36be364fb2 100644
--- a/test/av1_common_int_test.cc
+++ b/test/av1_common_int_test.cc
@@ -9,7 +9,7 @@
* PATENTS file, you can obtain it at www.aomedia.org/license/patent.
*/
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
#include "av1/common/av1_common_int.h"
diff --git a/test/av1_config_test.cc b/test/av1_config_test.cc
index 1e89f9d4d6..a198a56f3b 100644
--- a/test/av1_config_test.cc
+++ b/test/av1_config_test.cc
@@ -11,8 +11,8 @@
#include <string.h>
#include "common/av1_config.h"
+#include "gtest/gtest.h"
#include "test/util.h"
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
namespace {
diff --git a/test/av1_convolve_scale_test.cc b/test/av1_convolve_scale_test.cc
index ac723017bb..a8344feb91 100644
--- a/test/av1_convolve_scale_test.cc
+++ b/test/av1_convolve_scale_test.cc
@@ -12,7 +12,7 @@
#include <tuple>
#include <vector>
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
#include "config/aom_config.h"
#include "config/av1_rtcd.h"
diff --git a/test/av1_convolve_test.cc b/test/av1_convolve_test.cc
index 8a5c166134..d20a125fe0 100644
--- a/test/av1_convolve_test.cc
+++ b/test/av1_convolve_test.cc
@@ -16,9 +16,9 @@
#include <vector>
#include "config/av1_rtcd.h"
#include "config/aom_dsp_rtcd.h"
-#include "test/acm_random.h"
#include "aom_ports/aom_timer.h"
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
+#include "test/acm_random.h"
namespace {
diff --git a/test/av1_encoder_parms_get_to_decoder.cc b/test/av1_encoder_parms_get_to_decoder.cc
index b690f3b648..2867754152 100644
--- a/test/av1_encoder_parms_get_to_decoder.cc
+++ b/test/av1_encoder_parms_get_to_decoder.cc
@@ -11,7 +11,7 @@
#include <memory>
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
#include "test/codec_factory.h"
#include "test/encode_test_driver.h"
diff --git a/test/av1_ext_tile_test.cc b/test/av1_ext_tile_test.cc
index 7048927cd9..1eb6ced758 100644
--- a/test/av1_ext_tile_test.cc
+++ b/test/av1_ext_tile_test.cc
@@ -12,7 +12,7 @@
#include <assert.h>
#include <string>
#include <vector>
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
#include "test/codec_factory.h"
#include "test/encode_test_driver.h"
#include "test/i420_video_source.h"
diff --git a/test/av1_external_partition_test.cc b/test/av1_external_partition_test.cc
index 10c130683e..0fe2dde488 100644
--- a/test/av1_external_partition_test.cc
+++ b/test/av1_external_partition_test.cc
@@ -18,7 +18,7 @@
#include "aom/aom_external_partition.h"
#include "av1/common/blockd.h"
#include "av1/encoder/encodeframe_utils.h"
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
#include "test/codec_factory.h"
#include "test/encode_test_driver.h"
#include "test/y4m_video_source.h"
diff --git a/test/av1_highbd_iht_test.cc b/test/av1_highbd_iht_test.cc
index 649e367751..24cf9b03eb 100644
--- a/test/av1_highbd_iht_test.cc
+++ b/test/av1_highbd_iht_test.cc
@@ -11,7 +11,7 @@
#include <tuple>
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
#include "config/av1_rtcd.h"
diff --git a/test/av1_horz_only_frame_superres_test.cc b/test/av1_horz_only_frame_superres_test.cc
index d72ce1ea1b..2430a1a059 100644
--- a/test/av1_horz_only_frame_superres_test.cc
+++ b/test/av1_horz_only_frame_superres_test.cc
@@ -12,7 +12,7 @@
#include <tuple>
#include <vector>
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
#include "config/av1_rtcd.h"
diff --git a/test/av1_k_means_test.cc b/test/av1_k_means_test.cc
index ce08986e5f..db73847210 100644
--- a/test/av1_k_means_test.cc
+++ b/test/av1_k_means_test.cc
@@ -21,11 +21,11 @@
#include "aom_mem/aom_mem.h"
#include "aom_ports/aom_timer.h"
#include "aom_ports/mem.h"
-#include "test/acm_random.h"
#include "av1/encoder/palette.h"
+#include "gtest/gtest.h"
+#include "test/acm_random.h"
#include "test/register_state_check.h"
#include "test/util.h"
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
namespace AV1Kmeans {
typedef void (*av1_calc_indices_dim1_func)(const int16_t *data,
diff --git a/test/av1_key_value_api_test.cc b/test/av1_key_value_api_test.cc
index a25fbcf050..03cdeee523 100644
--- a/test/av1_key_value_api_test.cc
+++ b/test/av1_key_value_api_test.cc
@@ -18,7 +18,7 @@
#include "aom/aomcx.h"
#include "aom/aomdx.h"
#include "config/aom_config.h"
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
namespace {
typedef std::tuple<const char *, const char *> KeyValParam;
diff --git a/test/av1_nn_predict_test.cc b/test/av1_nn_predict_test.cc
index dc714920b7..9f6e8fac9c 100644
--- a/test/av1_nn_predict_test.cc
+++ b/test/av1_nn_predict_test.cc
@@ -11,7 +11,7 @@
#include <tuple>
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
#include "aom/aom_integer.h"
#include "aom_ports/aom_timer.h"
diff --git a/test/av1_quantize_test.cc b/test/av1_quantize_test.cc
index 3e6697186b..101186bc3e 100644
--- a/test/av1_quantize_test.cc
+++ b/test/av1_quantize_test.cc
@@ -10,7 +10,7 @@
*/
#include <stdlib.h>
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
#include "config/aom_config.h"
#include "config/av1_rtcd.h"
diff --git a/test/av1_round_shift_array_test.cc b/test/av1_round_shift_array_test.cc
index 67cacaf67d..e9731b1d37 100644
--- a/test/av1_round_shift_array_test.cc
+++ b/test/av1_round_shift_array_test.cc
@@ -19,9 +19,9 @@
#include "aom_mem/aom_mem.h"
#include "aom_ports/aom_timer.h"
#include "aom_ports/mem.h"
+#include "gtest/gtest.h"
#include "test/acm_random.h"
#include "test/util.h"
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
namespace AV1CompRoundShift {
diff --git a/test/av1_softmax_test.cc b/test/av1_softmax_test.cc
index 928b5857e5..18af945eb9 100644
--- a/test/av1_softmax_test.cc
+++ b/test/av1_softmax_test.cc
@@ -19,10 +19,10 @@
#include "config/aom_config.h"
#include "config/aom_dsp_rtcd.h"
#include "config/av1_rtcd.h"
+#include "gtest/gtest.h"
#include "test/acm_random.h"
#include "test/register_state_check.h"
#include "test/util.h"
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
namespace {
using FastSoftmaxFn = void (*)(const float *const input, float *output);
diff --git a/test/av1_txfm_test.h b/test/av1_txfm_test.h
index 337304d7ed..0a78ca34aa 100644
--- a/test/av1_txfm_test.h
+++ b/test/av1_txfm_test.h
@@ -21,7 +21,7 @@
#include "config/av1_rtcd.h"
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
#include "test/acm_random.h"
#include "av1/common/av1_txfm.h"
diff --git a/test/av1_wedge_utils_test.cc b/test/av1_wedge_utils_test.cc
index 4967e9cb48..af11494d59 100644
--- a/test/av1_wedge_utils_test.cc
+++ b/test/av1_wedge_utils_test.cc
@@ -9,7 +9,7 @@
* PATENTS file, you can obtain it at www.aomedia.org/license/patent.
*/
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
#include "config/aom_config.h"
#include "config/aom_dsp_rtcd.h"
diff --git a/test/avg_test.cc b/test/avg_test.cc
index 21c34ccc36..d1698fc1fa 100644
--- a/test/avg_test.cc
+++ b/test/avg_test.cc
@@ -14,7 +14,7 @@
#include <string>
#include <tuple>
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
#include "config/aom_config.h"
#include "config/aom_dsp_rtcd.h"
diff --git a/test/avif_progressive_test.cc b/test/avif_progressive_test.cc
index d75f7063d8..ba0b159741 100644
--- a/test/avif_progressive_test.cc
+++ b/test/avif_progressive_test.cc
@@ -16,7 +16,7 @@
#include "aom/aom_codec.h"
#include "aom/aom_encoder.h"
#include "aom/aom_image.h"
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
namespace {
diff --git a/test/binary_codes_test.cc b/test/binary_codes_test.cc
index e9dc85e88f..c62e320ec2 100644
--- a/test/binary_codes_test.cc
+++ b/test/binary_codes_test.cc
@@ -13,7 +13,7 @@
#include <stdlib.h>
#include <string.h>
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
#include "config/aom_config.h"
diff --git a/test/blend_a64_mask_1d_test.cc b/test/blend_a64_mask_1d_test.cc
index e6e4de1ca2..feee2d4add 100644
--- a/test/blend_a64_mask_1d_test.cc
+++ b/test/blend_a64_mask_1d_test.cc
@@ -13,7 +13,7 @@
#include <stdlib.h>
#include <string.h>
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
#include "test/register_state_check.h"
#include "test/function_equivalence_test.h"
diff --git a/test/blend_a64_mask_test.cc b/test/blend_a64_mask_test.cc
index 3538677b43..43d0162c58 100644
--- a/test/blend_a64_mask_test.cc
+++ b/test/blend_a64_mask_test.cc
@@ -13,7 +13,7 @@
#include <stdlib.h>
#include <string.h>
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
#include "test/register_state_check.h"
#include "test/function_equivalence_test.h"
diff --git a/test/block_test.cc b/test/block_test.cc
index 6714393ec3..9600a2bb66 100644
--- a/test/block_test.cc
+++ b/test/block_test.cc
@@ -11,7 +11,7 @@
#include "aom/aom_codec.h"
#include "av1/common/blockd.h"
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
#include "test/codec_factory.h"
#include "test/encode_test_driver.h"
#include "test/y4m_video_source.h"
diff --git a/test/boolcoder_test.cc b/test/boolcoder_test.cc
index c36980cc7b..de2ba659b3 100644
--- a/test/boolcoder_test.cc
+++ b/test/boolcoder_test.cc
@@ -13,7 +13,7 @@
#include <stdlib.h>
#include <string.h>
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
#include "test/acm_random.h"
#include "aom/aom_integer.h"
diff --git a/test/borders_test.cc b/test/borders_test.cc
index df793b6c95..a97d33ec4d 100644
--- a/test/borders_test.cc
+++ b/test/borders_test.cc
@@ -11,7 +11,7 @@
#include <climits>
#include <vector>
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
#include "test/codec_factory.h"
#include "test/encode_test_driver.h"
#include "test/i420_video_source.h"
diff --git a/test/cdef_test.cc b/test/cdef_test.cc
index 601b0384c6..7ce278c05c 100644
--- a/test/cdef_test.cc
+++ b/test/cdef_test.cc
@@ -15,7 +15,7 @@
#include <string>
#include <tuple>
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
#include "config/aom_config.h"
#include "config/av1_rtcd.h"
diff --git a/test/cfl_test.cc b/test/cfl_test.cc
index bde346a378..e093c4e354 100644
--- a/test/cfl_test.cc
+++ b/test/cfl_test.cc
@@ -11,7 +11,7 @@
#include <tuple>
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
#include "config/av1_rtcd.h"
diff --git a/test/cnn_test.cc b/test/cnn_test.cc
index f57e26d0f8..3012451de8 100644
--- a/test/cnn_test.cc
+++ b/test/cnn_test.cc
@@ -13,7 +13,7 @@
#include <math.h>
#include <stdio.h>
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
#include "config/av1_rtcd.h"
diff --git a/test/coding_path_sync.cc b/test/coding_path_sync.cc
index 79098376d4..a4e95e3165 100644
--- a/test/coding_path_sync.cc
+++ b/test/coding_path_sync.cc
@@ -10,7 +10,7 @@
*/
#include <vector>
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
#include "test/acm_random.h"
#include "config/aom_config.h"
diff --git a/test/comp_avg_pred_test.cc b/test/comp_avg_pred_test.cc
index b9375d14b6..18c077b1ae 100644
--- a/test/comp_avg_pred_test.cc
+++ b/test/comp_avg_pred_test.cc
@@ -14,7 +14,7 @@
#include "config/aom_dsp_rtcd.h"
#include "config/av1_rtcd.h"
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
#include "test/acm_random.h"
#include "test/util.h"
#include "test/register_state_check.h"
diff --git a/test/comp_mask_pred_test.cc b/test/comp_mask_pred_test.cc
index 6b70ca23ff..953e48180f 100644
--- a/test/comp_mask_pred_test.cc
+++ b/test/comp_mask_pred_test.cc
@@ -24,10 +24,10 @@
#include "aom_ports/mem.h"
#include "av1/common/reconinter.h"
#include "av1/encoder/reconinter_enc.h"
+#include "gtest/gtest.h"
#include "test/acm_random.h"
#include "test/register_state_check.h"
#include "test/util.h"
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
namespace {
typedef void (*comp_mask_pred_func)(uint8_t *comp_pred, const uint8_t *pred,
diff --git a/test/convolve_test.cc b/test/convolve_test.cc
index 9d3fa452b2..09e5f64faf 100644
--- a/test/convolve_test.cc
+++ b/test/convolve_test.cc
@@ -12,7 +12,7 @@
#include <string.h>
#include <tuple>
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
#include "config/aom_config.h"
#include "config/aom_dsp_rtcd.h"
diff --git a/test/corner_match_test.cc b/test/corner_match_test.cc
index 76f5345950..a805329ec7 100644
--- a/test/corner_match_test.cc
+++ b/test/corner_match_test.cc
@@ -14,7 +14,7 @@
#include "config/aom_dsp_rtcd.h"
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
#include "test/acm_random.h"
#include "test/util.h"
#include "test/register_state_check.h"
diff --git a/test/cpu_speed_test.cc b/test/cpu_speed_test.cc
index a6ab219ae0..422bb74ad7 100644
--- a/test/cpu_speed_test.cc
+++ b/test/cpu_speed_test.cc
@@ -9,7 +9,7 @@
* PATENTS file, you can obtain it at www.aomedia.org/license/patent.
*/
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
#include "test/codec_factory.h"
#include "test/encode_test_driver.h"
#include "test/i420_video_source.h"
diff --git a/test/datarate_test.cc b/test/datarate_test.cc
index facd86e36b..a66c90e517 100644
--- a/test/datarate_test.cc
+++ b/test/datarate_test.cc
@@ -11,7 +11,7 @@
#include "config/aom_config.h"
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
#include "test/acm_random.h"
#include "test/codec_factory.h"
#include "test/datarate_test.h"
diff --git a/test/datarate_test.h b/test/datarate_test.h
index 5b5c45e1a5..9c88ef528c 100644
--- a/test/datarate_test.h
+++ b/test/datarate_test.h
@@ -11,7 +11,7 @@
#include "config/aom_config.h"
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
#include "test/codec_factory.h"
#include "test/encode_test_driver.h"
#include "test/i420_video_source.h"
diff --git a/test/decode_api_test.cc b/test/decode_api_test.cc
index e07b3a30d7..f504be053b 100644
--- a/test/decode_api_test.cc
+++ b/test/decode_api_test.cc
@@ -9,7 +9,7 @@
* PATENTS file, you can obtain it at www.aomedia.org/license/patent.
*/
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
#include "config/aom_config.h"
diff --git a/test/decode_multithreaded_test.cc b/test/decode_multithreaded_test.cc
index 18086a2d6a..b0bd9d4cae 100644
--- a/test/decode_multithreaded_test.cc
+++ b/test/decode_multithreaded_test.cc
@@ -14,12 +14,12 @@
#include <string>
#include "aom_mem/aom_mem.h"
+#include "gtest/gtest.h"
#include "test/codec_factory.h"
#include "test/encode_test_driver.h"
#include "test/i420_video_source.h"
#include "test/md5_helper.h"
#include "test/util.h"
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
namespace {
diff --git a/test/decode_scalability_test.cc b/test/decode_scalability_test.cc
index 2102ddb8c2..85cea91193 100644
--- a/test/decode_scalability_test.cc
+++ b/test/decode_scalability_test.cc
@@ -11,12 +11,12 @@
#include <ostream>
+#include "gtest/gtest.h"
#include "test/codec_factory.h"
#include "test/decode_test_driver.h"
#include "test/ivf_video_source.h"
#include "test/util.h"
#include "test/video_source.h"
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
namespace {
diff --git a/test/decode_test_driver.cc b/test/decode_test_driver.cc
index acfc882ce7..22a87ef434 100644
--- a/test/decode_test_driver.cc
+++ b/test/decode_test_driver.cc
@@ -9,7 +9,7 @@
* PATENTS file, you can obtain it at www.aomedia.org/license/patent.
*/
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
#include "test/codec_factory.h"
#include "test/decode_test_driver.h"
diff --git a/test/decode_test_driver.h b/test/decode_test_driver.h
index 7812d708ec..4fa6c29fca 100644
--- a/test/decode_test_driver.h
+++ b/test/decode_test_driver.h
@@ -12,7 +12,7 @@
#ifndef AOM_TEST_DECODE_TEST_DRIVER_H_
#define AOM_TEST_DECODE_TEST_DRIVER_H_
#include <cstring>
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
#include "config/aom_config.h"
diff --git a/test/deltaq_mode_test.cc b/test/deltaq_mode_test.cc
index 424af81405..35b697d550 100644
--- a/test/deltaq_mode_test.cc
+++ b/test/deltaq_mode_test.cc
@@ -18,7 +18,7 @@
#include "aom/aom_encoder.h"
#include "aom/aom_image.h"
#include "config/aom_config.h"
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
namespace {
diff --git a/test/disflow_test.cc b/test/disflow_test.cc
index 5c07b0758e..d881f7baa4 100644
--- a/test/disflow_test.cc
+++ b/test/disflow_test.cc
@@ -11,7 +11,7 @@
#include "aom_dsp/flow_estimation/disflow.h"
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
#include "config/aom_dsp_rtcd.h"
#include "test/acm_random.h"
diff --git a/test/divu_small_test.cc b/test/divu_small_test.cc
index 7ddb22d8fd..4587803c8a 100644
--- a/test/divu_small_test.cc
+++ b/test/divu_small_test.cc
@@ -11,7 +11,7 @@
#include <stdlib.h>
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
#include "test/acm_random.h"
#include "aom_dsp/odintrin.h"
diff --git a/test/dr_prediction_test.cc b/test/dr_prediction_test.cc
index 0938a3db11..de90ec7bd6 100644
--- a/test/dr_prediction_test.cc
+++ b/test/dr_prediction_test.cc
@@ -12,7 +12,7 @@
#include <tuple>
#include <vector>
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
#include "config/aom_config.h"
#include "config/aom_dsp_rtcd.h"
diff --git a/test/ec_test.cc b/test/ec_test.cc
index b60ccbf8b6..5c80c9822c 100644
--- a/test/ec_test.cc
+++ b/test/ec_test.cc
@@ -9,7 +9,7 @@
* PATENTS file, you can obtain it at www.aomedia.org/license/patent.
*/
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
#include <cstdlib>
#include <memory>
diff --git a/test/encode_api_test.cc b/test/encode_api_test.cc
index 36e79145f6..4a714584b3 100644
-
(Patch may be truncated, please check the link at the top of this post.)