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
diff --git a/test/accounting_test.cc b/test/accounting_test.cc
index a861c59..2c90a67 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 56b229e..6fb6d56 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 b9c44c1..fd5d619 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 c234cb5..e588f61 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 ea5f302..354a5a8 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 d972791..5976061 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 43dbbd0..0092a8d 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 be0be00..2496342 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 f97bad2..9e8e42d 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 b38f038..1236ce2 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 fb8a6b0..36be364 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 1e89f9d..a198a56 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 ac72301..a8344fe 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 8a5c166..d20a125 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 b690f3b..2867754 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 7048927..1eb6ced 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 10c1306..0fe2dde 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 649e367..24cf9b0 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 d72ce1e..2430a1a 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 ce08986..db738472 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 a25fbcf..03cdeee 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 dc71492..9f6e8fa 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 3e66971..101186b 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 67cacaf..e9731b1 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 928b585..18af945 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 337304d..0a78ca3 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 4967e9c..af11494 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 21c34cc..d1698fc 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 d75f706..ba0b159 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 e9dc85e..c62e320 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 e6e4de1..feee2d4 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 3538677..43d0162 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 6714393..9600a2b 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 c36980c..de2ba65 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 df793b6..a97d33e 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 601b038..7ce278c 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 bde346a..e093c4e 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 f57e26d..3012451 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 7909837..a4e95e3 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 b9375d1..18c077b 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 6b70ca2..953e481 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 9d3fa45..09e5f64 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 76f5345..a805329 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 a6ab219..422bb74 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 facd86e..a66c90e 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 5b5c45e..9c88ef5 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 e07b3a3..f504be0 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 18086a2..b0bd9d4 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 2102ddb..85cea91 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 acfc882..22a87ef 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 7812d70..4fa6c29 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 424af81..35b697d 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 5c07b07..d881f7b 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 7ddb22d..4587803 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 0938a3d..de90ec7 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 b60ccbf..5c80c98 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 36e7914..4a71458 100644
--- a/test/encode_api_test.cc
+++ b/test/encode_api_test.cc
@@ -16,7 +16,7 @@
#include <cstring>
#include <tuple>
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
#include "config/aom_config.h"
diff --git a/test/encode_perf_test.cc b/test/encode_perf_test.cc
index ba78a98..4f3806f 100644
--- a/test/encode_perf_test.cc
+++ b/test/encode_perf_test.cc
@@ -10,7 +10,7 @@
*/
#include <string>
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
#include "aom/aom_codec.h"
#include "aom_ports/aom_timer.h"
diff --git a/test/encode_small_width_height_test.cc b/test/encode_small_width_height_test.cc
index 893e5ed..2d705a7 100644
--- a/test/encode_small_width_height_test.cc
+++ b/test/encode_small_width_height_test.cc
@@ -20,7 +20,7 @@
#include "aom/aomcx.h"
#include "aom/aom_encoder.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/encode_test_driver.cc b/test/encode_test_driver.cc
index fb5ddca..7bd956d 100644
--- a/test/encode_test_driver.cc
+++ b/test/encode_test_driver.cc
@@ -12,7 +12,7 @@
#include <memory>
#include <string>
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
#include "config/aom_config.h"
diff --git a/test/encode_test_driver.h b/test/encode_test_driver.h
index 9a66e44..d665af9 100644
--- a/test/encode_test_driver.h
+++ b/test/encode_test_driver.h
@@ -14,7 +14,7 @@
#include <string>
#include <vector>
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
#include "config/aom_config.h"
diff --git a/test/encodemb_test.cc b/test/encodemb_test.cc
index f84b23e..c148a71 100644
--- a/test/encodemb_test.cc
+++ b/test/encodemb_test.cc
@@ -12,7 +12,7 @@
#include <stdint.h>
#include <vector>
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
#include "av1/encoder/block.h"
#include "av1/encoder/encodemb.h"
diff --git a/test/encodetxb_test.cc b/test/encodetxb_test.cc
index 30cf053..55047e7 100644
--- a/test/encodetxb_test.cc
+++ b/test/encodetxb_test.cc
@@ -14,7 +14,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/av1_rtcd.h"
diff --git a/test/end_to_end_psnr_test.cc b/test/end_to_end_psnr_test.cc
index 722ea54..0daa44d 100644
--- a/test/end_to_end_psnr_test.cc
+++ b/test/end_to_end_psnr_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/end_to_end_qmpsnr_test.cc b/test/end_to_end_qmpsnr_test.cc
index e5d8afd..c5911ff 100644
--- a/test/end_to_end_qmpsnr_test.cc
+++ b/test/end_to_end_qmpsnr_test.cc
@@ -14,11 +14,11 @@
#include "aom_ports/mem.h"
#include "aom_dsp/ssim.h"
#include "av1/common/blockd.h"
+#include "gtest/gtest.h"
#include "test/codec_factory.h"
#include "test/encode_test_driver.h"
#include "test/util.h"
#include "test/y4m_video_source.h"
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
namespace {
diff --git a/test/end_to_end_ssim_test.cc b/test/end_to_end_ssim_test.cc
index ee13e0f..2b3fb87 100644
--- a/test/end_to_end_ssim_test.cc
+++ b/test/end_to_end_ssim_test.cc
@@ -12,11 +12,11 @@
#include "aom_ports/mem.h"
#include "aom_dsp/ssim.h"
#include "av1/common/blockd.h"
+#include "gtest/gtest.h"
#include "test/codec_factory.h"
#include "test/encode_test_driver.h"
#include "test/util.h"
#include "test/y4m_video_source.h"
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
namespace {
diff --git a/test/error_block_test.cc b/test/error_block_test.cc
index 45d363e..2139537 100644
--- a/test/error_block_test.cc
+++ b/test/error_block_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/av1_rtcd.h"
diff --git a/test/error_resilience_test.cc b/test/error_resilience_test.cc
index ef10ee8..efe4c49 100644
--- a/test/error_resilience_test.cc
+++ b/test/error_resilience_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/ethread_test.cc b/test/ethread_test.cc
index 552ea18..b366422 100644
--- a/test/ethread_test.cc
+++ b/test/ethread_test.cc
@@ -11,7 +11,7 @@
#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/md5_helper.h"
diff --git a/test/fdct4x4_test.cc b/test/fdct4x4_test.cc
index 1fb3a9a..eceaf27 100644
--- a/test/fdct4x4_test.cc
+++ b/test/fdct4x4_test.cc
@@ -15,7 +15,7 @@
#include <tuple>
#include "aom_dsp/aom_dsp_common.h"
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
#include "config/av1_rtcd.h"
#include "config/aom_dsp_rtcd.h"
diff --git a/test/fft_test.cc b/test/fft_test.cc
index b110601..1d3d59a 100644
--- a/test/fft_test.cc
+++ b/test/fft_test.cc
@@ -20,8 +20,8 @@
#include "aom_mem/aom_mem.h"
#include "av1/common/common.h"
#include "config/aom_dsp_rtcd.h"
+#include "gtest/gtest.h"
#include "test/acm_random.h"
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
namespace {
diff --git a/test/film_grain_table_test.cc b/test/film_grain_table_test.cc
index ca6f1be..33a7097 100644
--- a/test/film_grain_table_test.cc
+++ b/test/film_grain_table_test.cc
@@ -10,7 +10,7 @@
*/
#include <string>
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
#include "aom_dsp/grain_table.h"
#include "aom/internal/aom_codec_internal.h"
#include "av1/encoder/grain_test_vectors.h"
diff --git a/test/filterintra_test.cc b/test/filterintra_test.cc
index 1d6c7f7..d425287 100644
--- a/test/filterintra_test.cc
+++ b/test/filterintra_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/firstpass_test.cc b/test/firstpass_test.cc
index 020f6b3..33aa8ac 100644
--- a/test/firstpass_test.cc
+++ b/test/firstpass_test.cc
@@ -13,7 +13,7 @@
#include "av1/common/common.h"
#include "av1/encoder/firstpass.h"
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
namespace {
diff --git a/test/force_key_frame_test.cc b/test/force_key_frame_test.cc
index f00b803..48ebcb2 100644
--- a/test/force_key_frame_test.cc
+++ b/test/force_key_frame_test.cc
@@ -19,7 +19,7 @@
#include "aom/aomcx.h"
#include "aom/aom_encoder.h"
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
namespace {
diff --git a/test/forced_max_frame_width_height_test.cc b/test/forced_max_frame_width_height_test.cc
index ccde456..5211d66 100644
--- a/test/forced_max_frame_width_height_test.cc
+++ b/test/forced_max_frame_width_height_test.cc
@@ -22,7 +22,7 @@
#include "aom/aomcx.h"
#include "aom/aom_encoder.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/frame_parallel_enc_test.cc b/test/frame_parallel_enc_test.cc
index cb69429..68c8271 100644
--- a/test/frame_parallel_enc_test.cc
+++ b/test/frame_parallel_enc_test.cc
@@ -11,7 +11,7 @@
#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/md5_helper.h"
diff --git a/test/frame_resize_test.cc b/test/frame_resize_test.cc
index 029a823..a9acb24 100644
--- a/test/frame_resize_test.cc
+++ b/test/frame_resize_test.cc
@@ -13,11 +13,11 @@
#include <new>
#include "config/av1_rtcd.h"
-#include "test/acm_random.h"
-#include "test/util.h"
#include "aom_ports/aom_timer.h"
#include "aom_ports/bitops.h"
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
+#include "test/acm_random.h"
+#include "test/util.h"
namespace {
diff --git a/test/frame_size_tests.cc b/test/frame_size_tests.cc
index 32d9a45..65269aa 100644
--- a/test/frame_size_tests.cc
+++ b/test/frame_size_tests.cc
@@ -12,7 +12,7 @@
#include <array>
#include <memory>
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
#include "test/codec_factory.h"
#include "test/video_source.h"
#include "test/util.h"
diff --git a/test/function_equivalence_test.h b/test/function_equivalence_test.h
index e8f9835..6d15fa0 100644
--- a/test/function_equivalence_test.h
+++ b/test/function_equivalence_test.h
@@ -14,7 +14,7 @@
#include <ostream>
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
#include "test/acm_random.h"
#include "test/util.h"
diff --git a/test/fwht4x4_test.cc b/test/fwht4x4_test.cc
index 630bd14..8e9600a 100644
--- a/test/fwht4x4_test.cc
+++ b/test/fwht4x4_test.cc
@@ -15,7 +15,7 @@
#include <tuple>
#include "aom_dsp/aom_dsp_common.h"
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
#include "config/av1_rtcd.h"
#include "config/aom_dsp_rtcd.h"
diff --git a/test/gf_pyr_height_test.cc b/test/gf_pyr_height_test.cc
index a38330b..0ce5d33 100644
--- a/test/gf_pyr_height_test.cc
+++ b/test/gf_pyr_height_test.cc
@@ -11,7 +11,7 @@
#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"
#include "test/i420_video_source.h"
diff --git a/test/hadamard_test.cc b/test/hadamard_test.cc
index aa9ceb0..b867d0a 100644
--- a/test/hadamard_test.cc
+++ b/test/hadamard_test.cc
@@ -12,7 +12,7 @@
#include <algorithm>
#include <ostream>
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
#include "config/aom_dsp_rtcd.h"
diff --git a/test/hash_test.cc b/test/hash_test.cc
index 5fd68a5..c82b8cd 100644
--- a/test/hash_test.cc
+++ b/test/hash_test.cc
@@ -18,9 +18,9 @@
#include "aom_ports/aom_timer.h"
#include "av1/encoder/hash.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 {
diff --git a/test/hbd_metrics_test.cc b/test/hbd_metrics_test.cc
index 7650f7f..af050a0 100644
--- a/test/hbd_metrics_test.cc
+++ b/test/hbd_metrics_test.cc
@@ -14,7 +14,7 @@
#include <new>
#include <tuple>
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
#include "test/acm_random.h"
#include "test/util.h"
diff --git a/test/hiprec_convolve_test.cc b/test/hiprec_convolve_test.cc
index 1eba7cd..2dde9da 100644
--- a/test/hiprec_convolve_test.cc
+++ b/test/hiprec_convolve_test.cc
@@ -11,7 +11,7 @@
#include <tuple>
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
#include "test/hiprec_convolve_test_util.h"
using libaom_test::ACMRandom;
diff --git a/test/hiprec_convolve_test_util.h b/test/hiprec_convolve_test_util.h
index d0ce96e..52a43e9 100644
--- a/test/hiprec_convolve_test_util.h
+++ b/test/hiprec_convolve_test_util.h
@@ -16,10 +16,10 @@
#include "config/av1_rtcd.h"
+#include "gtest/gtest.h"
#include "test/acm_random.h"
#include "test/util.h"
#include "test/register_state_check.h"
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
#include "aom_ports/aom_timer.h"
#include "av1/common/convolve.h"
diff --git a/test/horver_correlation_test.cc b/test/horver_correlation_test.cc
index 760461e..bab3912 100644
--- a/test/horver_correlation_test.cc
+++ b/test/horver_correlation_test.cc
@@ -11,7 +11,7 @@
#include <tuple>
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
#include "test/acm_random.h"
#include "test/register_state_check.h"
diff --git a/test/horz_superres_test.cc b/test/horz_superres_test.cc
index 963df87..fee0cca 100644
--- a/test/horz_superres_test.cc
+++ b/test/horz_superres_test.cc
@@ -13,7 +13,7 @@
#include <ostream>
#include <tuple>
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
#include "av1/encoder/encoder.h"
diff --git a/test/intra_edge_test.cc b/test/intra_edge_test.cc
index eb56b62..d5cc3d5 100644
--- a/test/intra_edge_test.cc
+++ b/test/intra_edge_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/intrabc_test.cc b/test/intrabc_test.cc
index 301cc6d..5293f01 100644
--- a/test/intrabc_test.cc
+++ b/test/intrabc_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/intrapred_test.cc b/test/intrapred_test.cc
index 157ad26..1371c7d 100644
--- a/test/intrapred_test.cc
+++ b/test/intrapred_test.cc
@@ -11,7 +11,7 @@
#include <string>
-#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/invalid_file_test.cc b/test/invalid_file_test.cc
index f4343b1..9a052b4 100644
--- a/test/invalid_file_test.cc
+++ b/test/invalid_file_test.cc
@@ -13,7 +13,7 @@
#include <ostream>
#include <string>
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
#include "test/codec_factory.h"
#include "test/ivf_video_source.h"
#include "test/util.h"
diff --git a/test/kf_test.cc b/test/kf_test.cc
index 0ae3c64..3d76873 100644
--- a/test/kf_test.cc
+++ b/test/kf_test.cc
@@ -17,7 +17,7 @@
#include "aom/aom_encoder.h"
#include "aom/aom_image.h"
#include "aom/aomcx.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/level_test.cc b/test/level_test.cc
index 637e3e0..dd8981c 100644
--- a/test/level_test.cc
+++ b/test/level_test.cc
@@ -11,7 +11,7 @@
#include <memory>
#include <string>
-#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/log2_test.cc b/test/log2_test.cc
index 3b1c979..59b0423 100644
--- a/test/log2_test.cc
+++ b/test/log2_test.cc
@@ -14,7 +14,7 @@
#include "aom_ports/bitops.h"
#include "av1/common/entropymode.h"
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
TEST(Log2Test, GetMsb) {
// Test small numbers exhaustively.
diff --git a/test/loopfilter_control_test.cc b/test/loopfilter_control_test.cc
index d120aaa..04afa5b 100644
--- a/test/loopfilter_control_test.cc
+++ b/test/loopfilter_control_test.cc
@@ -13,7 +13,7 @@
#include <string>
#include <unordered_map>
-#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/lossless_test.cc b/test/lossless_test.cc
index fff874c..5e126b6 100644
--- a/test/lossless_test.cc
+++ b/test/lossless_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/lpf_test.cc b/test/lpf_test.cc
index 998ebb8..edb107b 100644
--- a/test/lpf_test.cc
+++ b/test/lpf_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/masked_sad_test.cc b/test/masked_sad_test.cc
index 0d5986c..8f825c6 100644
--- a/test/masked_sad_test.cc
+++ b/test/masked_sad_test.cc
@@ -13,7 +13,7 @@
#include <string.h>
#include <tuple>
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
#include "test/acm_random.h"
#include "test/register_state_check.h"
#include "test/util.h"
diff --git a/test/masked_variance_test.cc b/test/masked_variance_test.cc
index 14d36d8..4d9ebe9 100644
--- a/test/masked_variance_test.cc
+++ b/test/masked_variance_test.cc
@@ -14,7 +14,7 @@
#include <string.h>
#include <tuple>
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
#include "test/acm_random.h"
#include "test/register_state_check.h"
#include "test/util.h"
diff --git a/test/metadata_test.cc b/test/metadata_test.cc
index e1538f6..537909f 100644
--- a/test/metadata_test.cc
+++ b/test/metadata_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 "aom/aom_codec.h"
#include "aom/aom_image.h"
diff --git a/test/minmax_test.cc b/test/minmax_test.cc
index dd88541..b87ee97 100644
--- a/test/minmax_test.cc
+++ b/test/minmax_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"
#include "config/aom_dsp_rtcd.h"
diff --git a/test/monochrome_test.cc b/test/monochrome_test.cc
index 1989131..c157275 100644
--- a/test/monochrome_test.cc
+++ b/test/monochrome_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/motion_vector_test.cc b/test/motion_vector_test.cc
index 2d897ca..0709eeb 100644
--- a/test/motion_vector_test.cc
+++ b/test/motion_vector_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/mv_cost_test.cc b/test/mv_cost_test.cc
index a0aed58..d8ab5e0 100644
--- a/test/mv_cost_test.cc
+++ b/test/mv_cost_test.cc
@@ -11,7 +11,7 @@
#include "av1/encoder/cost.h"
#include "av1/encoder/encodemv.h"
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
namespace {
diff --git a/test/noise_model_test.cc b/test/noise_model_test.cc
index 2ef5dc2..9f05a44 100644
--- a/test/noise_model_test.cc
+++ b/test/noise_model_test.cc
@@ -17,8 +17,8 @@
#include "aom_dsp/noise_model.h"
#include "aom_dsp/noise_util.h"
#include "config/aom_dsp_rtcd.h"
+#include "gtest/gtest.h"
#include "test/acm_random.h"
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
namespace {
diff --git a/test/obmc_sad_test.cc b/test/obmc_sad_test.cc
index 0f01e90..dd6484f 100644
--- a/test/obmc_sad_test.cc
+++ b/test/obmc_sad_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/function_equivalence_test.h"
#include "test/register_state_check.h"
diff --git a/test/obmc_variance_test.cc b/test/obmc_variance_test.cc
index a629d3c..39b816e 100644
--- a/test/obmc_variance_test.cc
+++ b/test/obmc_variance_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/acm_random.h"
#include "test/function_equivalence_test.h"
diff --git a/test/pickrst_test.cc b/test/pickrst_test.cc
index 3ab22e1..fd25b0c 100644
--- a/test/pickrst_test.cc
+++ b/test/pickrst_test.cc
@@ -11,7 +11,7 @@
#include <tuple>
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
#include "test/register_state_check.h"
#include "test/acm_random.h"
diff --git a/test/quant_test.cc b/test/quant_test.cc
index 40ca470..120eae7 100644
--- a/test/quant_test.cc
+++ b/test/quant_test.cc
@@ -10,12 +10,12 @@
*/
#include "config/aom_config.h"
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
+#include "av1/encoder/av1_quantize.h"
+#include "gtest/gtest.h"
#include "test/codec_factory.h"
#include "test/encode_test_driver.h"
#include "test/i420_video_source.h"
#include "test/util.h"
-#include "av1/encoder/av1_quantize.h"
#include "test/y4m_video_source.h"
namespace {
diff --git a/test/quantize_func_test.cc b/test/quantize_func_test.cc
index bebf72f..ac41714 100644
--- a/test/quantize_func_test.cc
+++ b/test/quantize_func_test.cc
@@ -12,7 +12,7 @@
#include <algorithm>
#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/ratectrl_rtc_test.cc b/test/ratectrl_rtc_test.cc
index 6691115..31ae450 100644
--- a/test/ratectrl_rtc_test.cc
+++ b/test/ratectrl_rtc_test.cc
@@ -13,11 +13,11 @@
#include <memory>
+#include "gtest/gtest.h"
#include "test/codec_factory.h"
#include "test/encode_test_driver.h"
-#include "test/util.h"
#include "test/i420_video_source.h"
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
+#include "test/util.h"
namespace {
diff --git a/test/ratectrl_test.cc b/test/ratectrl_test.cc
index 259f123..329ec89 100644
--- a/test/ratectrl_test.cc
+++ b/test/ratectrl_test.cc
@@ -12,7 +12,7 @@
#include "av1/encoder/firstpass.h"
#include "av1/encoder/ratectrl.h"
#include "av1/encoder/tpl_model.h"
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
namespace {
diff --git a/test/rd_test.cc b/test/rd_test.cc
index 8c9a54c..58049ed 100644
--- a/test/rd_test.cc
+++ b/test/rd_test.cc
@@ -15,7 +15,7 @@
#include "av1/common/quant_common.h"
#include "av1/encoder/rd.h"
#include "aom/aom_codec.h"
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
namespace {
diff --git a/test/reconinter_test.cc b/test/reconinter_test.cc
index 772cb9b..91bf720 100644
--- a/test/reconinter_test.cc
+++ b/test/reconinter_test.cc
@@ -20,10 +20,10 @@
#include "aom_ports/mem.h"
#include "av1/common/scan.h"
#include "av1/common/txb_common.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 libaom_test::ACMRandom;
diff --git a/test/register_state_check.h b/test/register_state_check.h
index b70fb50..20fe88a 100644
--- a/test/register_state_check.h
+++ b/test/register_state_check.h
@@ -12,7 +12,7 @@
#ifndef AOM_TEST_REGISTER_STATE_CHECK_H_
#define AOM_TEST_REGISTER_STATE_CHECK_H_
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
#include "config/aom_config.h"
diff --git a/test/resize_test.cc b/test/resize_test.cc
index 1682f9f..6eacb41 100644
--- a/test/resize_test.cc
+++ b/test/resize_test.cc
@@ -15,7 +15,7 @@
#include "aom/aomcx.h"
#include "aom_dsp/aom_dsp_common.h"
#include "av1/encoder/encoder.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/rt_end_to_end_test.cc b/test/rt_end_to_end_test.cc
index 2d07f0f..1e9238c 100644
--- a/test/rt_end_to_end_test.cc
+++ b/test/rt_end_to_end_test.cc
@@ -14,7 +14,7 @@
#include <string>
#include <unordered_map>
-#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/sad_test.cc b/test/sad_test.cc
index cd29a6f..fd10999 100644
--- a/test/sad_test.cc
+++ b/test/sad_test.cc
@@ -14,7 +14,7 @@
#include <stdio.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/sb_multipass_test.cc b/test/sb_multipass_test.cc
index f70ebd2..3982daf 100644
--- a/test/sb_multipass_test.cc
+++ b/test/sb_multipass_test.cc
@@ -12,7 +12,7 @@
#include <initializer_list>
#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/md5_helper.h"
diff --git a/test/sb_qp_sweep_test.cc b/test/sb_qp_sweep_test.cc
index 5555d20..2e303b8 100644
--- a/test/sb_qp_sweep_test.cc
+++ b/test/sb_qp_sweep_test.cc
@@ -14,12 +14,12 @@
#include <string>
#include <vector>
+#include "gtest/gtest.h"
#include "test/codec_factory.h"
#include "test/encode_test_driver.h"
#include "test/md5_helper.h"
#include "test/util.h"
#include "test/yuv_video_source.h"
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
namespace {
diff --git a/test/scalability_test.cc b/test/scalability_test.cc
index 6196b3e..781823c 100644
--- a/test/scalability_test.cc
+++ b/test/scalability_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/scan_test.cc b/test/scan_test.cc
index 54a05ea..17178ab 100644
--- a/test/scan_test.cc
+++ b/test/scan_test.cc
@@ -9,9 +9,9 @@
* PATENTS file, you can obtain it at www.aomedia.org/license/patent.
*/
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
#include "av1/common/scan.h"
#include "av1/common/txb_common.h"
+#include "gtest/gtest.h"
#include "test/av1_txfm_test.h"
static int scan_test(const int16_t *scan, const int16_t *iscan, int si, int r,
diff --git a/test/screen_content_test.cc b/test/screen_content_test.cc
index 681843f..837bdf7 100644
--- a/test/screen_content_test.cc
+++ b/test/screen_content_test.cc
@@ -9,7 +9,7 @@
* PATENTS file, you can obtain it at www.aomedia.org/license/patent.
*/
#include "aom/aom_codec.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/segment_binarization_sync.cc b/test/segment_binarization_sync.cc
index db866cf..2d4b6be 100644
--- a/test/segment_binarization_sync.cc
+++ b/test/segment_binarization_sync.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/seg_common.h"
#include "av1/decoder/decodemv.h"
diff --git a/test/selfguided_filter_test.cc b/test/selfguided_filter_test.cc
index 9f793af..33e9920 100644
--- a/test/selfguided_filter_test.cc
+++ b/test/selfguided_filter_test.cc
@@ -12,7 +12,7 @@
#include <ctime>
#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/sharpness_test.cc b/test/sharpness_test.cc
index afd6445..d3815fd 100644
--- a/test/sharpness_test.cc
+++ b/test/sharpness_test.cc
@@ -11,7 +11,7 @@
#include <unordered_map>
-#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/simd_impl.h b/test/simd_impl.h
index d055eba..f11c903 100644
--- a/test/simd_impl.h
+++ b/test/simd_impl.h
@@ -12,10 +12,10 @@
#include <tuple>
#define SIMD_CHECK 1
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
-#include "test/register_state_check.h"
#include "aom_dsp/aom_simd_inline.h"
#include "aom_dsp/simd/v256_intrinsics_c.h"
+#include "gtest/gtest.h"
+#include "test/register_state_check.h"
namespace SIMD_NAMESPACE {
diff --git a/test/sse_sum_test.cc b/test/sse_sum_test.cc
index 0dba47d..54fbeae 100644
--- a/test/sse_sum_test.cc
+++ b/test/sse_sum_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/still_picture_test.cc b/test/still_picture_test.cc
index 2908a5d..7420b32 100644
--- a/test/still_picture_test.cc
+++ b/test/still_picture_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/subtract_test.cc b/test/subtract_test.cc
index 1f454b6..ca2b2a9 100644
--- a/test/subtract_test.cc
+++ b/test/subtract_test.cc
@@ -12,7 +12,7 @@
#include <cstdint>
#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/sum_squares_test.cc b/test/sum_squares_test.cc
index e2c4556..f9174c1 100644
--- a/test/sum_squares_test.cc
+++ b/test/sum_squares_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/svc_datarate_test.cc b/test/svc_datarate_test.cc
index 633c279..7da2160 100644
--- a/test/svc_datarate_test.cc
+++ b/test/svc_datarate_test.cc
@@ -12,7 +12,7 @@
#include <climits>
#include <vector>
#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/datarate_test.h"
#include "test/encode_test_driver.h"
diff --git a/test/temporal_filter_test.cc b/test/temporal_filter_test.cc
index 52e2366..cda06c5 100644
--- a/test/temporal_filter_test.cc
+++ b/test/temporal_filter_test.cc
@@ -16,7 +16,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/test_aom_rc.cc b/test/test_aom_rc.cc
index 2252443..a4ea8f9 100644
--- a/test/test_aom_rc.cc
+++ b/test/test_aom_rc.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"
int main(int argc, char **argv) {
::testing::InitGoogleTest(&argc, argv);
diff --git a/test/test_intra_pred_speed.cc b/test/test_intra_pred_speed.cc
index b5dbadd..b4849ed 100644
--- a/test/test_intra_pred_speed.cc
+++ b/test/test_intra_pred_speed.cc
@@ -14,7 +14,7 @@
#include <stdio.h>
#include <string>
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
#include "config/aom_dsp_rtcd.h"
diff --git a/test/test_libaom.cc b/test/test_libaom.cc
index 2a29b45..b8a91e0 100644
--- a/test/test_libaom.cc
+++ b/test/test_libaom.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/test_vector_test.cc b/test/test_vector_test.cc
index fd93002..b521e93 100644
--- a/test/test_vector_test.cc
+++ b/test/test_vector_test.cc
@@ -15,9 +15,9 @@
#include <set>
#include <string>
#include <tuple>
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
#include "common/tools_common.h"
#include "config/aom_config.h"
+#include "gtest/gtest.h"
#include "test/codec_factory.h"
#include "test/decode_test_driver.h"
#include "test/ivf_video_source.h"
diff --git a/test/tile_config_test.cc b/test/tile_config_test.cc
index 4bd4a67..7604f23 100644
--- a/test/tile_config_test.cc
+++ b/test/tile_config_test.cc
@@ -11,7 +11,7 @@
#include "aom/aom_codec.h"
#include "aom_dsp/aom_dsp_common.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/tile_independence_test.cc b/test/tile_independence_test.cc
index fcfcbce..a2ea5c3 100644
--- a/test/tile_independence_test.cc
+++ b/test/tile_independence_test.cc
@@ -12,7 +12,7 @@
#include <cstdio>
#include <cstdlib>
#include <string>
-#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/time_stamp_test.cc b/test/time_stamp_test.cc
index 1732041..c3ef1ec 100644
--- a/test/time_stamp_test.cc
+++ b/test/time_stamp_test.cc
@@ -11,11 +11,11 @@
// Test AOM timestamp handling
+#include "gtest/gtest.h"
#include "test/codec_factory.h"
#include "test/encode_test_driver.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/tpl_model_test.cc b/test/tpl_model_test.cc
index 4f15fb5..3657009 100644
--- a/test/tpl_model_test.cc
+++ b/test/tpl_model_test.cc
@@ -17,7 +17,7 @@
#include "av1/encoder/cost.h"
#include "av1/encoder/tpl_model.h"
#include "av1/encoder/encoder.h"
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
namespace {
diff --git a/test/transform_test_base.h b/test/transform_test_base.h
index 92385c3..4c037da 100644
--- a/test/transform_test_base.h
+++ b/test/transform_test_base.h
@@ -12,7 +12,7 @@
#ifndef AOM_TEST_TRANSFORM_TEST_BASE_H_
#define AOM_TEST_TRANSFORM_TEST_BASE_H_
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
#include "aom/aom_codec.h"
#include "aom_dsp/txfm_common.h"
diff --git a/test/util.h b/test/util.h
index e043d87..c60e961 100644
--- a/test/util.h
+++ b/test/util.h
@@ -15,7 +15,7 @@
#include <math.h>
#include <stdio.h>
#include <string.h>
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
#include "aom/aom_image.h"
#include "aom_ports/aom_timer.h"
diff --git a/test/variance_test.cc b/test/variance_test.cc
index 283c174..6f98ae4 100644
--- a/test/variance_test.cc
+++ b/test/variance_test.cc
@@ -14,7 +14,7 @@
#include <ostream>
#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/video_source.h b/test/video_source.h
index da51f6a..d537d55 100644
--- a/test/video_source.h
+++ b/test/video_source.h
@@ -27,7 +27,7 @@
#include "aom/aom_encoder.h"
#include "test/acm_random.h"
#if !defined(_WIN32)
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
#endif
namespace libaom_test {
diff --git a/test/warp_filter_test.cc b/test/warp_filter_test.cc
index bade679..3a35075 100644
--- a/test/warp_filter_test.cc
+++ b/test/warp_filter_test.cc
@@ -10,7 +10,7 @@
*/
#include <tuple>
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
#include "test/warp_filter_test_util.h"
using libaom_test::ACMRandom;
#if CONFIG_AV1_HIGHBITDEPTH
diff --git a/test/warp_filter_test_util.h b/test/warp_filter_test_util.h
index b2f370e..7e401d8 100644
--- a/test/warp_filter_test_util.h
+++ b/test/warp_filter_test_util.h
@@ -17,7 +17,7 @@
#include "config/av1_rtcd.h"
#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/webmenc_test.cc b/test/webmenc_test.cc
index eba0760..d6245f5 100644
--- a/test/webmenc_test.cc
+++ b/test/webmenc_test.cc
@@ -11,7 +11,7 @@
#include <string>
#include "common/webmenc.h"
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
namespace {
diff --git a/test/wiener_test.cc b/test/wiener_test.cc
index d0bd045..2cac268 100644
--- a/test/wiener_test.cc
+++ b/test/wiener_test.cc
@@ -13,7 +13,7 @@
#include <utility>
#include <vector>
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
+#include "gtest/gtest.h"
#include "test/register_state_check.h"
#include "test/acm_random.h"
diff --git a/test/y4m_test.cc b/test/y4m_test.cc
index beec69c5..a96ab12 100644
--- a/test/y4m_test.cc
+++ b/test/y4m_test.cc
@@ -14,10 +14,10 @@
#include "config/aom_config.h"
#include "common/y4menc.h"
+#include "gtest/gtest.h"
#include "test/md5_helper.h"
#include "test/util.h"
#include "test/y4m_video_source.h"
-#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
namespace {
