cmake: generate rtcd headers in config subdir.
Move rtcd header outputs to config subdir of config dir,
and update include sites.
Change-Id: I25c5f1808a091f3727934adc274637ebdcdcb1cf
diff --git a/test/av1_convolve_2d_test_util.h b/test/av1_convolve_2d_test_util.h
index eba765f..3a53dbd 100644
--- a/test/av1_convolve_2d_test_util.h
+++ b/test/av1_convolve_2d_test_util.h
@@ -12,11 +12,13 @@
#ifndef TEST_HIPREC_CONVOLVE_TEST_UTIL_H_
#define TEST_HIPREC_CONVOLVE_TEST_UTIL_H_
+#include "config/av1_rtcd.h"
+#include "config/aom_dsp_rtcd.h"
+
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
#include "test/acm_random.h"
#include "test/util.h"
-#include "./av1_rtcd.h"
-#include "./aom_dsp_rtcd.h"
+
#include "test/clear_system_state.h"
#include "test/register_state_check.h"
diff --git a/test/av1_convolve_scale_test.cc b/test/av1_convolve_scale_test.cc
index 3e49f1f..e057142 100644
--- a/test/av1_convolve_scale_test.cc
+++ b/test/av1_convolve_scale_test.cc
@@ -13,7 +13,8 @@
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
-#include "./av1_rtcd.h"
+#include "config/av1_rtcd.h"
+
#include "aom_ports/aom_timer.h"
#include "test/acm_random.h"
#include "test/clear_system_state.h"
diff --git a/test/av1_fwd_txfm2d_test.cc b/test/av1_fwd_txfm2d_test.cc
index bccbda6..e0294be 100644
--- a/test/av1_fwd_txfm2d_test.cc
+++ b/test/av1_fwd_txfm2d_test.cc
@@ -14,11 +14,12 @@
#include <stdlib.h>
#include <vector>
+#include "config/av1_rtcd.h"
+
#include "test/acm_random.h"
#include "test/util.h"
#include "test/av1_txfm_test.h"
#include "av1/common/av1_txfm.h"
-#include "./av1_rtcd.h"
using libaom_test::ACMRandom;
using libaom_test::TYPE_TXFM;
diff --git a/test/av1_highbd_iht_test.cc b/test/av1_highbd_iht_test.cc
index 2c697c5..8cadc85 100644
--- a/test/av1_highbd_iht_test.cc
+++ b/test/av1_highbd_iht_test.cc
@@ -11,7 +11,8 @@
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
-#include "./av1_rtcd.h"
+#include "config/av1_rtcd.h"
+
#include "test/acm_random.h"
#include "test/clear_system_state.h"
#include "test/register_state_check.h"
diff --git a/test/av1_horz_only_frame_superres_test.cc b/test/av1_horz_only_frame_superres_test.cc
index 42ede4b..fd77ef3 100644
--- a/test/av1_horz_only_frame_superres_test.cc
+++ b/test/av1_horz_only_frame_superres_test.cc
@@ -13,7 +13,8 @@
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
-#include "./av1_rtcd.h"
+#include "config/av1_rtcd.h"
+
#include "aom_ports/aom_timer.h"
#include "av1/common/convolve.h"
#include "av1/common/resize.h"
diff --git a/test/av1_inv_txfm2d_test.cc b/test/av1_inv_txfm2d_test.cc
index 43afc08..461e7eb 100644
--- a/test/av1_inv_txfm2d_test.cc
+++ b/test/av1_inv_txfm2d_test.cc
@@ -14,7 +14,7 @@
#include <stdlib.h>
#include <vector>
-#include "./av1_rtcd.h"
+#include "config/av1_rtcd.h"
#include "aom_ports/aom_timer.h"
#include "av1/common/av1_inv_txfm1d_cfg.h"
diff --git a/test/av1_quantize_test.cc b/test/av1_quantize_test.cc
index e379eb6..aaf0939 100644
--- a/test/av1_quantize_test.cc
+++ b/test/av1_quantize_test.cc
@@ -13,7 +13,7 @@
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
#include "config/aom_config.h"
-#include "./av1_rtcd.h"
+#include "config/av1_rtcd.h"
#include "test/acm_random.h"
#include "test/clear_system_state.h"
diff --git a/test/av1_txfm_test.h b/test/av1_txfm_test.h
index e7bfad9..70d1a89 100644
--- a/test/av1_txfm_test.h
+++ b/test/av1_txfm_test.h
@@ -19,13 +19,14 @@
#endif
#include <math.h>
+#include "config/av1_rtcd.h"
+
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
#include "test/acm_random.h"
#include "av1/common/av1_txfm.h"
#include "av1/common/blockd.h"
#include "av1/common/enums.h"
-#include "./av1_rtcd.h"
namespace libaom_test {
typedef enum {
diff --git a/test/av1_wedge_utils_test.cc b/test/av1_wedge_utils_test.cc
index 79f3b40..62d8748 100644
--- a/test/av1_wedge_utils_test.cc
+++ b/test/av1_wedge_utils_test.cc
@@ -12,8 +12,8 @@
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
#include "config/aom_config.h"
-#include "./aom_dsp_rtcd.h"
-#include "./av1_rtcd.h"
+#include "config/aom_dsp_rtcd.h"
+#include "config/av1_rtcd.h"
#include "aom_dsp/aom_dsp_common.h"
diff --git a/test/avg_test.cc b/test/avg_test.cc
index a89b9b1..86fbf34 100644
--- a/test/avg_test.cc
+++ b/test/avg_test.cc
@@ -16,7 +16,7 @@
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
#include "config/aom_config.h"
-#include "./aom_dsp_rtcd.h"
+#include "config/aom_dsp_rtcd.h"
#include "test/acm_random.h"
#include "test/clear_system_state.h"
diff --git a/test/blend_a64_mask_1d_test.cc b/test/blend_a64_mask_1d_test.cc
index 417a02e..01f7c42 100644
--- a/test/blend_a64_mask_1d_test.cc
+++ b/test/blend_a64_mask_1d_test.cc
@@ -18,12 +18,11 @@
#include "test/function_equivalence_test.h"
#include "config/aom_config.h"
-#include "./aom_dsp_rtcd.h"
+#include "config/aom_dsp_rtcd.h"
+#include "config/av1_rtcd.h"
#include "aom/aom_integer.h"
-#include "./av1_rtcd.h"
-
#include "av1/common/enums.h"
#include "aom_dsp/blend.h"
diff --git a/test/blend_a64_mask_test.cc b/test/blend_a64_mask_test.cc
index 3a2fa4e..5c87ec7 100644
--- a/test/blend_a64_mask_test.cc
+++ b/test/blend_a64_mask_test.cc
@@ -18,12 +18,11 @@
#include "test/function_equivalence_test.h"
#include "config/aom_config.h"
-#include "./aom_dsp_rtcd.h"
+#include "config/aom_dsp_rtcd.h"
+#include "config/av1_rtcd.h"
#include "aom/aom_integer.h"
-#include "./av1_rtcd.h"
-
#include "av1/common/enums.h"
#include "aom_dsp/blend.h"
diff --git a/test/cdef_test.cc b/test/cdef_test.cc
index d51a2f4..becc072 100644
--- a/test/cdef_test.cc
+++ b/test/cdef_test.cc
@@ -15,7 +15,7 @@
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
#include "config/aom_config.h"
-#include "./av1_rtcd.h"
+#include "config/av1_rtcd.h"
#include "aom_ports/aom_timer.h"
#include "av1/common/cdef_block.h"
diff --git a/test/cfl_test.cc b/test/cfl_test.cc
index 020c124..51bdec9 100644
--- a/test/cfl_test.cc
+++ b/test/cfl_test.cc
@@ -11,8 +11,9 @@
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
+#include "config/av1_rtcd.h"
+
#include "aom_ports/aom_timer.h"
-#include "./av1_rtcd.h"
#include "test/util.h"
#include "test/acm_random.h"
diff --git a/test/comp_avg_pred_test.h b/test/comp_avg_pred_test.h
index 6486bf9..ab2004c 100644
--- a/test/comp_avg_pred_test.h
+++ b/test/comp_avg_pred_test.h
@@ -12,10 +12,11 @@
#ifndef TEST_COMP_AVG_PRED_TEST_H_
#define TEST_COMP_AVG_PRED_TEST_H_
+#include "config/aom_dsp_rtcd.h"
+
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
#include "test/acm_random.h"
#include "test/util.h"
-#include "./aom_dsp_rtcd.h"
#include "test/clear_system_state.h"
#include "test/register_state_check.h"
#include "av1/common/common_data.h"
diff --git a/test/comp_mask_variance_test.cc b/test/comp_mask_variance_test.cc
index 38e8187..a5e3f34 100644
--- a/test/comp_mask_variance_test.cc
+++ b/test/comp_mask_variance_test.cc
@@ -13,7 +13,7 @@
#include <new>
#include "config/aom_config.h"
-#include "./aom_dsp_rtcd.h"
+#include "config/aom_dsp_rtcd.h"
#include "aom/aom_codec.h"
#include "aom/aom_integer.h"
diff --git a/test/convolve_round_test.cc b/test/convolve_round_test.cc
index ab24899..2f801e7 100644
--- a/test/convolve_round_test.cc
+++ b/test/convolve_round_test.cc
@@ -11,7 +11,8 @@
#include <assert.h>
-#include "./av1_rtcd.h"
+#include "config/av1_rtcd.h"
+
#include "aom/aom_integer.h"
#include "aom_ports/aom_timer.h"
#include "test/acm_random.h"
diff --git a/test/convolve_test.cc b/test/convolve_test.cc
index cd1a4b4..e171a8e 100644
--- a/test/convolve_test.cc
+++ b/test/convolve_test.cc
@@ -14,7 +14,7 @@
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
#include "config/aom_config.h"
-#include "./aom_dsp_rtcd.h"
+#include "config/aom_dsp_rtcd.h"
#include "aom_dsp/aom_dsp_common.h"
#include "aom_dsp/aom_filter.h"
diff --git a/test/corner_match_test.cc b/test/corner_match_test.cc
index fd9536b..58e3139 100644
--- a/test/corner_match_test.cc
+++ b/test/corner_match_test.cc
@@ -8,11 +8,11 @@
* Media Patent License 1.0 was not distributed with this source code in the
* PATENTS file, you can obtain it at www.aomedia.org/license/patent.
*/
+#include "config/av1_rtcd.h"
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
#include "test/acm_random.h"
#include "test/util.h"
-#include "./av1_rtcd.h"
#include "test/clear_system_state.h"
#include "test/register_state_check.h"
diff --git a/test/encodetxb_test.cc b/test/encodetxb_test.cc
index d7a0334..ab6ec72 100644
--- a/test/encodetxb_test.cc
+++ b/test/encodetxb_test.cc
@@ -16,7 +16,7 @@
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
#include "config/aom_config.h"
-#include "./av1_rtcd.h"
+#include "config/av1_rtcd.h"
#include "aom_ports/aom_timer.h"
#include "aom_ports/mem.h"
diff --git a/test/error_block_test.cc b/test/error_block_test.cc
index 867aded..353947c 100644
--- a/test/error_block_test.cc
+++ b/test/error_block_test.cc
@@ -16,7 +16,7 @@
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
#include "config/aom_config.h"
-#include "./av1_rtcd.h"
+#include "config/av1_rtcd.h"
#include "test/acm_random.h"
#include "test/clear_system_state.h"
diff --git a/test/filterintra_test.cc b/test/filterintra_test.cc
index 4c3e33f..5971349 100644
--- a/test/filterintra_test.cc
+++ b/test/filterintra_test.cc
@@ -11,7 +11,8 @@
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
-#include "./av1_rtcd.h"
+#include "config/av1_rtcd.h"
+
#include "test/acm_random.h"
#include "test/clear_system_state.h"
#include "test/register_state_check.h"
diff --git a/test/fwht4x4_test.cc b/test/fwht4x4_test.cc
index 2a326dc..c8d98c5 100644
--- a/test/fwht4x4_test.cc
+++ b/test/fwht4x4_test.cc
@@ -15,8 +15,8 @@
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
-#include "./av1_rtcd.h"
-#include "./aom_dsp_rtcd.h"
+#include "config/av1_rtcd.h"
+#include "config/aom_dsp_rtcd.h"
#include "test/acm_random.h"
#include "test/clear_system_state.h"
#include "test/register_state_check.h"
diff --git a/test/hadamard_test.cc b/test/hadamard_test.cc
index db5cb74..344ce5b 100644
--- a/test/hadamard_test.cc
+++ b/test/hadamard_test.cc
@@ -13,7 +13,7 @@
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
-#include "./aom_dsp_rtcd.h"
+#include "config/aom_dsp_rtcd.h"
#include "test/acm_random.h"
#include "test/register_state_check.h"
diff --git a/test/hash_test.cc b/test/hash_test.cc
index 0f6905a..e9f7f63 100644
--- a/test/hash_test.cc
+++ b/test/hash_test.cc
@@ -13,7 +13,7 @@
#include <new>
#include "config/aom_config.h"
-#include "./av1_rtcd.h"
+#include "config/av1_rtcd.h"
#include "aom_ports/aom_timer.h"
#include "av1/encoder/hash.h"
diff --git a/test/hiprec_convolve_test_util.h b/test/hiprec_convolve_test_util.h
index c50fcf3..81471c8 100644
--- a/test/hiprec_convolve_test_util.h
+++ b/test/hiprec_convolve_test_util.h
@@ -12,13 +12,14 @@
#ifndef TEST_HIPREC_CONVOLVE_TEST_UTIL_H_
#define TEST_HIPREC_CONVOLVE_TEST_UTIL_H_
+#include "config/av1_rtcd.h"
+
#include "test/acm_random.h"
#include "test/util.h"
#include "test/clear_system_state.h"
#include "test/register_state_check.h"
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
-#include "./av1_rtcd.h"
#include "aom_ports/aom_timer.h"
#include "av1/common/convolve.h"
#include "av1/common/mv.h"
diff --git a/test/intra_edge_test.cc b/test/intra_edge_test.cc
index ab5a3c9..ce61402 100644
--- a/test/intra_edge_test.cc
+++ b/test/intra_edge_test.cc
@@ -18,12 +18,10 @@
#include "test/function_equivalence_test.h"
#include "config/aom_config.h"
-#include "./aom_dsp_rtcd.h"
+#include "config/aom_dsp_rtcd.h"
+#include "config/av1_rtcd.h"
#include "aom/aom_integer.h"
-
-#include "./av1_rtcd.h"
-
#include "av1/common/enums.h"
using libaom_test::FunctionEquivalenceTest;
diff --git a/test/intrapred_test.cc b/test/intrapred_test.cc
index 6ff09d7..cefbb6b 100644
--- a/test/intrapred_test.cc
+++ b/test/intrapred_test.cc
@@ -14,7 +14,7 @@
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
#include "config/aom_config.h"
-#include "./aom_dsp_rtcd.h"
+#include "config/aom_dsp_rtcd.h"
#include "test/acm_random.h"
#include "test/clear_system_state.h"
diff --git a/test/lpf_test.cc b/test/lpf_test.cc
index 94a4b00..9938af3 100644
--- a/test/lpf_test.cc
+++ b/test/lpf_test.cc
@@ -16,7 +16,7 @@
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
#include "config/aom_config.h"
-#include "./aom_dsp_rtcd.h"
+#include "config/aom_dsp_rtcd.h"
#include "test/acm_random.h"
#include "test/clear_system_state.h"
diff --git a/test/masked_sad_test.cc b/test/masked_sad_test.cc
index d3dbedb..1a393a0 100644
--- a/test/masked_sad_test.cc
+++ b/test/masked_sad_test.cc
@@ -19,7 +19,7 @@
#include "test/util.h"
#include "config/aom_config.h"
-#include "./aom_dsp_rtcd.h"
+#include "config/aom_dsp_rtcd.h"
#include "aom/aom_integer.h"
diff --git a/test/masked_variance_test.cc b/test/masked_variance_test.cc
index ee71246..275b9fe 100644
--- a/test/masked_variance_test.cc
+++ b/test/masked_variance_test.cc
@@ -20,7 +20,7 @@
#include "test/util.h"
#include "config/aom_config.h"
-#include "./aom_dsp_rtcd.h"
+#include "config/aom_dsp_rtcd.h"
#include "aom/aom_codec.h"
#include "aom/aom_integer.h"
diff --git a/test/minmax_test.cc b/test/minmax_test.cc
index aaac72c..cccdbf5 100644
--- a/test/minmax_test.cc
+++ b/test/minmax_test.cc
@@ -14,7 +14,8 @@
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
-#include "./aom_dsp_rtcd.h"
+#include "config/aom_dsp_rtcd.h"
+
#include "aom/aom_integer.h"
#include "test/acm_random.h"
diff --git a/test/obmc_sad_test.cc b/test/obmc_sad_test.cc
index 4679ccc..1820da2 100644
--- a/test/obmc_sad_test.cc
+++ b/test/obmc_sad_test.cc
@@ -15,7 +15,7 @@
#include "test/register_state_check.h"
#include "config/aom_config.h"
-#include "./aom_dsp_rtcd.h"
+#include "config/aom_dsp_rtcd.h"
#include "aom/aom_integer.h"
diff --git a/test/obmc_variance_test.cc b/test/obmc_variance_test.cc
index 45c051a..04fee82 100644
--- a/test/obmc_variance_test.cc
+++ b/test/obmc_variance_test.cc
@@ -16,7 +16,7 @@
#include "test/register_state_check.h"
#include "config/aom_config.h"
-#include "./aom_dsp_rtcd.h"
+#include "config/aom_dsp_rtcd.h"
#include "aom/aom_integer.h"
diff --git a/test/quantize_func_test.cc b/test/quantize_func_test.cc
index ea8553f..97e73bf 100644
--- a/test/quantize_func_test.cc
+++ b/test/quantize_func_test.cc
@@ -12,8 +12,8 @@
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
#include "config/aom_config.h"
-#include "./aom_dsp_rtcd.h"
-#include "./av1_rtcd.h"
+#include "config/aom_dsp_rtcd.h"
+#include "config/av1_rtcd.h"
#include "aom/aom_codec.h"
#include "aom_ports/aom_timer.h"
diff --git a/test/reconinter_test.cc b/test/reconinter_test.cc
index 58d04f5..2f4dc3a 100644
--- a/test/reconinter_test.cc
+++ b/test/reconinter_test.cc
@@ -14,7 +14,7 @@
#include <string.h>
#include "config/aom_config.h"
-#include "./av1_rtcd.h"
+#include "config/av1_rtcd.h"
#include "aom_ports/mem.h"
#include "av1/common/scan.h"
diff --git a/test/sad_test.cc b/test/sad_test.cc
index 092a42d..5bec2c1 100644
--- a/test/sad_test.cc
+++ b/test/sad_test.cc
@@ -16,7 +16,7 @@
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
#include "config/aom_config.h"
-#include "./aom_dsp_rtcd.h"
+#include "config/aom_dsp_rtcd.h"
#include "test/acm_random.h"
#include "test/clear_system_state.h"
diff --git a/test/selfguided_filter_test.cc b/test/selfguided_filter_test.cc
index 532636d..4506a90 100644
--- a/test/selfguided_filter_test.cc
+++ b/test/selfguided_filter_test.cc
@@ -13,7 +13,8 @@
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
-#include "./av1_rtcd.h"
+#include "config/av1_rtcd.h"
+
#include "test/acm_random.h"
#include "test/clear_system_state.h"
#include "test/register_state_check.h"
diff --git a/test/simd_cmp_impl.h b/test/simd_cmp_impl.h
index e1f1d5c..6c79cbc 100644
--- a/test/simd_cmp_impl.h
+++ b/test/simd_cmp_impl.h
@@ -11,7 +11,9 @@
#include <assert.h>
#include <string>
-#include "./aom_dsp_rtcd.h"
+
+#include "config/aom_dsp_rtcd.h"
+
#include "test/acm_random.h"
#include "aom_dsp/aom_simd.h"
#undef SIMD_INLINE
diff --git a/test/subtract_test.cc b/test/subtract_test.cc
index a990f27..2d823ba 100644
--- a/test/subtract_test.cc
+++ b/test/subtract_test.cc
@@ -12,7 +12,7 @@
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
#include "config/aom_config.h"
-#include "./aom_dsp_rtcd.h"
+#include "config/aom_dsp_rtcd.h"
#include "test/acm_random.h"
#include "test/clear_system_state.h"
diff --git a/test/sum_squares_test.cc b/test/sum_squares_test.cc
index 6138a8b..c03ebad 100644
--- a/test/sum_squares_test.cc
+++ b/test/sum_squares_test.cc
@@ -16,7 +16,7 @@
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
#include "config/aom_config.h"
-#include "./aom_dsp_rtcd.h"
+#include "config/aom_dsp_rtcd.h"
#include "aom_ports/mem.h"
#include "test/acm_random.h"
diff --git a/test/test_intra_pred_speed.cc b/test/test_intra_pred_speed.cc
index 5c659d3..b72ac11 100644
--- a/test/test_intra_pred_speed.cc
+++ b/test/test_intra_pred_speed.cc
@@ -16,7 +16,8 @@
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
-#include "./aom_dsp_rtcd.h"
+#include "config/aom_dsp_rtcd.h"
+
#include "test/acm_random.h"
#include "test/clear_system_state.h"
#include "test/md5_helper.h"
diff --git a/test/variance_test.cc b/test/variance_test.cc
index 97ea5ad..a2063aa 100644
--- a/test/variance_test.cc
+++ b/test/variance_test.cc
@@ -15,7 +15,7 @@
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
#include "config/aom_config.h"
-#include "./aom_dsp_rtcd.h"
+#include "config/aom_dsp_rtcd.h"
#include "test/acm_random.h"
#include "test/clear_system_state.h"
diff --git a/test/warp_filter_test_util.h b/test/warp_filter_test_util.h
index 755db23..cf72d9d 100644
--- a/test/warp_filter_test_util.h
+++ b/test/warp_filter_test_util.h
@@ -12,11 +12,12 @@
#ifndef TEST_WARP_FILTER_TEST_UTIL_H_
#define TEST_WARP_FILTER_TEST_UTIL_H_
+#include "config/av1_rtcd.h"
+#include "config/aom_dsp_rtcd.h"
+
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
#include "test/acm_random.h"
#include "test/util.h"
-#include "./av1_rtcd.h"
-#include "./aom_dsp_rtcd.h"
#include "test/clear_system_state.h"
#include "test/register_state_check.h"
