cmake: Output aom_config in config sub dir.
Does away with somewhat confusing usage of "./aom_config.h" in
include statements while keeping linters silent.
aom_config.asm, aom_config.c, and aom_config.h are now written to
the config sub dir.
Change-Id: I99e2422d6ca8b20b9cdf2feee83a866c273e47b0
diff --git a/test/aq_segment_test.cc b/test/aq_segment_test.cc
index c72d9ae..bbb5027 100644
--- a/test/aq_segment_test.cc
+++ b/test/aq_segment_test.cc
@@ -9,7 +9,8 @@
* PATENTS file, you can obtain it at www.aomedia.org/license/patent.
*/
-#include "./aom_config.h"
+#include "config/aom_config.h"
+
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
#include "test/codec_factory.h"
#include "test/encode_test_driver.h"
diff --git a/test/av1_quantize_test.cc b/test/av1_quantize_test.cc
index e6bd3d6..e379eb6 100644
--- a/test/av1_quantize_test.cc
+++ b/test/av1_quantize_test.cc
@@ -12,8 +12,9 @@
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
-#include "./aom_config.h"
+#include "config/aom_config.h"
#include "./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_wedge_utils_test.cc b/test/av1_wedge_utils_test.cc
index d4b560f..79f3b40 100644
--- a/test/av1_wedge_utils_test.cc
+++ b/test/av1_wedge_utils_test.cc
@@ -11,8 +11,7 @@
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
-#include "./aom_config.h"
-
+#include "config/aom_config.h"
#include "./aom_dsp_rtcd.h"
#include "./av1_rtcd.h"
diff --git a/test/avg_test.cc b/test/avg_test.cc
index c3c6a03..a89b9b1 100644
--- a/test/avg_test.cc
+++ b/test/avg_test.cc
@@ -15,7 +15,7 @@
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
-#include "./aom_config.h"
+#include "config/aom_config.h"
#include "./aom_dsp_rtcd.h"
#include "test/acm_random.h"
diff --git a/test/binary_codes_test.cc b/test/binary_codes_test.cc
index 7203966..45660cf 100644
--- a/test/binary_codes_test.cc
+++ b/test/binary_codes_test.cc
@@ -15,7 +15,8 @@
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
-#include "./aom_config.h"
+#include "config/aom_config.h"
+
#include "test/acm_random.h"
#include "aom/aom_integer.h"
#include "aom_dsp/bitreader.h"
diff --git a/test/blend_a64_mask_1d_test.cc b/test/blend_a64_mask_1d_test.cc
index e8e9556..417a02e 100644
--- a/test/blend_a64_mask_1d_test.cc
+++ b/test/blend_a64_mask_1d_test.cc
@@ -17,8 +17,9 @@
#include "test/register_state_check.h"
#include "test/function_equivalence_test.h"
-#include "./aom_config.h"
+#include "config/aom_config.h"
#include "./aom_dsp_rtcd.h"
+
#include "aom/aom_integer.h"
#include "./av1_rtcd.h"
diff --git a/test/blend_a64_mask_test.cc b/test/blend_a64_mask_test.cc
index 519f854..3a2fa4e 100644
--- a/test/blend_a64_mask_test.cc
+++ b/test/blend_a64_mask_test.cc
@@ -17,8 +17,9 @@
#include "test/register_state_check.h"
#include "test/function_equivalence_test.h"
-#include "./aom_config.h"
+#include "config/aom_config.h"
#include "./aom_dsp_rtcd.h"
+
#include "aom/aom_integer.h"
#include "./av1_rtcd.h"
diff --git a/test/cdef_test.cc b/test/cdef_test.cc
index d15f8d7..d51a2f4 100644
--- a/test/cdef_test.cc
+++ b/test/cdef_test.cc
@@ -14,8 +14,9 @@
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
-#include "./aom_config.h"
+#include "config/aom_config.h"
#include "./av1_rtcd.h"
+
#include "aom_ports/aom_timer.h"
#include "av1/common/cdef_block.h"
#include "test/acm_random.h"
diff --git a/test/clear_system_state.h b/test/clear_system_state.h
index 4f3c1ee..7aa7824 100644
--- a/test/clear_system_state.h
+++ b/test/clear_system_state.h
@@ -11,7 +11,8 @@
#ifndef TEST_CLEAR_SYSTEM_STATE_H_
#define TEST_CLEAR_SYSTEM_STATE_H_
-#include "./aom_config.h"
+#include "config/aom_config.h"
+
#if ARCH_X86 || ARCH_X86_64
#include "aom_ports/x86.h"
#endif
diff --git a/test/codec_factory.h b/test/codec_factory.h
index 700960a..dee25a8 100644
--- a/test/codec_factory.h
+++ b/test/codec_factory.h
@@ -11,7 +11,8 @@
#ifndef TEST_CODEC_FACTORY_H_
#define TEST_CODEC_FACTORY_H_
-#include "./aom_config.h"
+#include "config/aom_config.h"
+
#include "aom/aom_decoder.h"
#include "aom/aom_encoder.h"
#if CONFIG_AV1_ENCODER
diff --git a/test/coding_path_sync.cc b/test/coding_path_sync.cc
index 8171cf1..51a5060 100644
--- a/test/coding_path_sync.cc
+++ b/test/coding_path_sync.cc
@@ -13,7 +13,7 @@
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
#include "test/acm_random.h"
-#include "./aom_config.h"
+#include "config/aom_config.h"
#include "aom_ports/mem.h" // ROUND_POWER_OF_TWO
#include "aom/aomcx.h"
diff --git a/test/comp_mask_variance_test.cc b/test/comp_mask_variance_test.cc
index 0b5c5b7..38e8187 100644
--- a/test/comp_mask_variance_test.cc
+++ b/test/comp_mask_variance_test.cc
@@ -12,8 +12,9 @@
#include <cstdlib>
#include <new>
-#include "./aom_config.h"
+#include "config/aom_config.h"
#include "./aom_dsp_rtcd.h"
+
#include "aom/aom_codec.h"
#include "aom/aom_integer.h"
#include "aom_dsp/variance.h"
diff --git a/test/convolve_test.cc b/test/convolve_test.cc
index ae4c438..cd1a4b4 100644
--- a/test/convolve_test.cc
+++ b/test/convolve_test.cc
@@ -13,8 +13,9 @@
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
-#include "./aom_config.h"
+#include "config/aom_config.h"
#include "./aom_dsp_rtcd.h"
+
#include "aom_dsp/aom_dsp_common.h"
#include "aom_dsp/aom_filter.h"
#include "aom_mem/aom_mem.h"
diff --git a/test/datarate_test.cc b/test/datarate_test.cc
index 4ad3101..1588d3c 100644
--- a/test/datarate_test.cc
+++ b/test/datarate_test.cc
@@ -9,7 +9,8 @@
* PATENTS file, you can obtain it at www.aomedia.org/license/patent.
*/
-#include "./aom_config.h"
+#include "config/aom_config.h"
+
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
#include "test/codec_factory.h"
#include "test/encode_test_driver.h"
diff --git a/test/decode_api_test.cc b/test/decode_api_test.cc
index 7a96a67..97cbd06 100644
--- a/test/decode_api_test.cc
+++ b/test/decode_api_test.cc
@@ -11,7 +11,8 @@
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
-#include "./aom_config.h"
+#include "config/aom_config.h"
+
#include "test/util.h"
#include "aom/aomdx.h"
#include "aom/aom_decoder.h"
diff --git a/test/decode_test_driver.h b/test/decode_test_driver.h
index f473bc7..916efda 100644
--- a/test/decode_test_driver.h
+++ b/test/decode_test_driver.h
@@ -13,7 +13,9 @@
#define TEST_DECODE_TEST_DRIVER_H_
#include <cstring>
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
-#include "./aom_config.h"
+
+#include "config/aom_config.h"
+
#include "aom/aom_decoder.h"
namespace libaom_test {
diff --git a/test/encode_api_test.cc b/test/encode_api_test.cc
index 32eb554..c469d08 100644
--- a/test/encode_api_test.cc
+++ b/test/encode_api_test.cc
@@ -11,7 +11,8 @@
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
-#include "./aom_config.h"
+#include "config/aom_config.h"
+
#include "test/util.h"
#include "aom/aomcx.h"
#include "aom/aom_encoder.h"
diff --git a/test/encode_perf_test.cc b/test/encode_perf_test.cc
index 9f3d753..dc30daa 100644
--- a/test/encode_perf_test.cc
+++ b/test/encode_perf_test.cc
@@ -11,7 +11,9 @@
#include <string>
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
-#include "./aom_config.h"
+
+#include "config/aom_config.h"
+
#include "./aom_version.h"
#include "test/codec_factory.h"
#include "test/encode_test_driver.h"
diff --git a/test/encode_test_driver.cc b/test/encode_test_driver.cc
index 7b6a86c..b75d7be 100644
--- a/test/encode_test_driver.cc
+++ b/test/encode_test_driver.cc
@@ -13,7 +13,8 @@
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
-#include "./aom_config.h"
+#include "config/aom_config.h"
+
#include "aom_ports/mem.h"
#include "test/codec_factory.h"
#include "test/decode_test_driver.h"
diff --git a/test/encode_test_driver.h b/test/encode_test_driver.h
index 89ea607..138cd6a 100644
--- a/test/encode_test_driver.h
+++ b/test/encode_test_driver.h
@@ -16,7 +16,8 @@
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
-#include "./aom_config.h"
+#include "config/aom_config.h"
+
#if CONFIG_AV1_ENCODER
#include "aom/aomcx.h"
#endif
diff --git a/test/encodetxb_test.cc b/test/encodetxb_test.cc
index 6a4f3cf..d7a0334 100644
--- a/test/encodetxb_test.cc
+++ b/test/encodetxb_test.cc
@@ -15,8 +15,9 @@
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
-#include "./aom_config.h"
+#include "config/aom_config.h"
#include "./av1_rtcd.h"
+
#include "aom_ports/aom_timer.h"
#include "aom_ports/mem.h"
#include "av1/common/idct.h"
diff --git a/test/error_block_test.cc b/test/error_block_test.cc
index 345c6cc..867aded 100644
--- a/test/error_block_test.cc
+++ b/test/error_block_test.cc
@@ -15,8 +15,9 @@
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
-#include "./aom_config.h"
+#include "config/aom_config.h"
#include "./av1_rtcd.h"
+
#include "test/acm_random.h"
#include "test/clear_system_state.h"
#include "test/register_state_check.h"
diff --git a/test/hash_test.cc b/test/hash_test.cc
index ebd4a0e..0f6905a 100644
--- a/test/hash_test.cc
+++ b/test/hash_test.cc
@@ -12,8 +12,9 @@
#include <cstdlib>
#include <new>
-#include "./aom_config.h"
+#include "config/aom_config.h"
#include "./av1_rtcd.h"
+
#include "aom_ports/aom_timer.h"
#include "av1/encoder/hash.h"
#include "test/acm_random.h"
diff --git a/test/hbd_metrics_test.cc b/test/hbd_metrics_test.cc
index 60c101e..09df9bd 100644
--- a/test/hbd_metrics_test.cc
+++ b/test/hbd_metrics_test.cc
@@ -16,7 +16,9 @@
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
#include "test/acm_random.h"
#include "test/util.h"
-#include "./aom_config.h"
+
+#include "config/aom_config.h"
+
#include "aom_dsp/psnr.h"
#include "aom_dsp/ssim.h"
#include "aom_ports/mem.h"
diff --git a/test/intra_edge_test.cc b/test/intra_edge_test.cc
index 5a8fff4..ab5a3c9 100644
--- a/test/intra_edge_test.cc
+++ b/test/intra_edge_test.cc
@@ -17,8 +17,9 @@
#include "test/register_state_check.h"
#include "test/function_equivalence_test.h"
-#include "./aom_config.h"
+#include "config/aom_config.h"
#include "./aom_dsp_rtcd.h"
+
#include "aom/aom_integer.h"
#include "./av1_rtcd.h"
diff --git a/test/intrabc_test.cc b/test/intrabc_test.cc
index a1ff337..3ea4217 100644
--- a/test/intrabc_test.cc
+++ b/test/intrabc_test.cc
@@ -11,7 +11,8 @@
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
-#include "./aom_config.h"
+#include "config/aom_config.h"
+
#include "av1/common/blockd.h"
#include "av1/common/enums.h"
#include "av1/common/mv.h"
diff --git a/test/intrapred_test.cc b/test/intrapred_test.cc
index 055165b..6ff09d7 100644
--- a/test/intrapred_test.cc
+++ b/test/intrapred_test.cc
@@ -13,8 +13,9 @@
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
-#include "./aom_config.h"
+#include "config/aom_config.h"
#include "./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/lossless_test.cc b/test/lossless_test.cc
index 2e1aca6..3f8e89c 100644
--- a/test/lossless_test.cc
+++ b/test/lossless_test.cc
@@ -11,7 +11,8 @@
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
-#include "./aom_config.h"
+#include "config/aom_config.h"
+
#include "test/codec_factory.h"
#include "test/encode_test_driver.h"
#include "test/i420_video_source.h"
diff --git a/test/lpf_test.cc b/test/lpf_test.cc
index 198bd1f..94a4b00 100644
--- a/test/lpf_test.cc
+++ b/test/lpf_test.cc
@@ -15,8 +15,9 @@
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
-#include "./aom_config.h"
+#include "config/aom_config.h"
#include "./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/masked_sad_test.cc b/test/masked_sad_test.cc
index 3651b36..d3dbedb 100644
--- a/test/masked_sad_test.cc
+++ b/test/masked_sad_test.cc
@@ -18,8 +18,9 @@
#include "test/register_state_check.h"
#include "test/util.h"
-#include "./aom_config.h"
+#include "config/aom_config.h"
#include "./aom_dsp_rtcd.h"
+
#include "aom/aom_integer.h"
using libaom_test::ACMRandom;
diff --git a/test/masked_variance_test.cc b/test/masked_variance_test.cc
index b1eb352..ee71246 100644
--- a/test/masked_variance_test.cc
+++ b/test/masked_variance_test.cc
@@ -19,8 +19,9 @@
#include "test/register_state_check.h"
#include "test/util.h"
-#include "./aom_config.h"
+#include "config/aom_config.h"
#include "./aom_dsp_rtcd.h"
+
#include "aom/aom_codec.h"
#include "aom/aom_integer.h"
#include "aom_dsp/aom_filter.h"
diff --git a/test/obmc_sad_test.cc b/test/obmc_sad_test.cc
index 64fd81d..4679ccc 100644
--- a/test/obmc_sad_test.cc
+++ b/test/obmc_sad_test.cc
@@ -14,8 +14,9 @@
#include "test/function_equivalence_test.h"
#include "test/register_state_check.h"
-#include "./aom_config.h"
+#include "config/aom_config.h"
#include "./aom_dsp_rtcd.h"
+
#include "aom/aom_integer.h"
#define MAX_SB_SQUARE (MAX_SB_SIZE * MAX_SB_SIZE)
diff --git a/test/obmc_variance_test.cc b/test/obmc_variance_test.cc
index 5fc1e9c..45c051a 100644
--- a/test/obmc_variance_test.cc
+++ b/test/obmc_variance_test.cc
@@ -15,8 +15,9 @@
#include "test/function_equivalence_test.h"
#include "test/register_state_check.h"
-#include "./aom_config.h"
+#include "config/aom_config.h"
#include "./aom_dsp_rtcd.h"
+
#include "aom/aom_integer.h"
#define MAX_SB_SQUARE (MAX_SB_SIZE * MAX_SB_SIZE)
diff --git a/test/qm_test.cc b/test/qm_test.cc
index b3731d9..c87506b 100644
--- a/test/qm_test.cc
+++ b/test/qm_test.cc
@@ -8,7 +8,8 @@
* 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 "./aom_config.h"
+#include "config/aom_config.h"
+
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
#include "test/codec_factory.h"
#include "test/encode_test_driver.h"
diff --git a/test/quantize_func_test.cc b/test/quantize_func_test.cc
index 6ce8c07..ea8553f 100644
--- a/test/quantize_func_test.cc
+++ b/test/quantize_func_test.cc
@@ -11,9 +11,10 @@
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
-#include "./aom_config.h"
+#include "config/aom_config.h"
#include "./aom_dsp_rtcd.h"
#include "./av1_rtcd.h"
+
#include "aom/aom_codec.h"
#include "aom_ports/aom_timer.h"
#include "av1/encoder/encoder.h"
diff --git a/test/reconinter_test.cc b/test/reconinter_test.cc
index 1161943..58d04f5 100644
--- a/test/reconinter_test.cc
+++ b/test/reconinter_test.cc
@@ -13,8 +13,9 @@
#include <stdio.h>
#include <string.h>
-#include "./aom_config.h"
+#include "config/aom_config.h"
#include "./av1_rtcd.h"
+
#include "aom_ports/mem.h"
#include "av1/common/scan.h"
#include "av1/common/txb_common.h"
diff --git a/test/register_state_check.h b/test/register_state_check.h
index bb43769..800d297 100644
--- a/test/register_state_check.h
+++ b/test/register_state_check.h
@@ -13,7 +13,9 @@
#define TEST_REGISTER_STATE_CHECK_H_
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
-#include "./aom_config.h"
+
+#include "config/aom_config.h"
+
#include "aom/aom_integer.h"
// ASM_REGISTER_STATE_CHECK(asm_function)
diff --git a/test/sad_test.cc b/test/sad_test.cc
index 3959e24..092a42d 100644
--- a/test/sad_test.cc
+++ b/test/sad_test.cc
@@ -15,8 +15,9 @@
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
-#include "./aom_config.h"
+#include "config/aom_config.h"
#include "./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/subtract_test.cc b/test/subtract_test.cc
index e218aab..a990f27 100644
--- a/test/subtract_test.cc
+++ b/test/subtract_test.cc
@@ -11,8 +11,9 @@
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
-#include "./aom_config.h"
+#include "config/aom_config.h"
#include "./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/sum_squares_test.cc b/test/sum_squares_test.cc
index d455c01..6138a8b 100644
--- a/test/sum_squares_test.cc
+++ b/test/sum_squares_test.cc
@@ -15,8 +15,9 @@
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
-#include "./aom_config.h"
+#include "config/aom_config.h"
#include "./aom_dsp_rtcd.h"
+
#include "aom_ports/mem.h"
#include "test/acm_random.h"
#include "test/clear_system_state.h"
diff --git a/test/test_libaom.cc b/test/test_libaom.cc
index c490588..92d40b5 100644
--- a/test/test_libaom.cc
+++ b/test/test_libaom.cc
@@ -15,7 +15,8 @@
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
-#include "./aom_config.h"
+#include "config/aom_config.h"
+
#if ARCH_X86 || ARCH_X86_64
#include "aom_ports/x86.h"
#endif
diff --git a/test/tools_common.sh b/test/tools_common.sh
index c34cf3a..d159e8f 100755
--- a/test/tools_common.sh
+++ b/test/tools_common.sh
@@ -144,7 +144,7 @@
# is available.
aom_config_option_enabled() {
aom_config_option="${1}"
- aom_config_file="${LIBAOM_CONFIG_PATH}/aom_config.h"
+ aom_config_file="${LIBAOM_CONFIG_PATH}/config/aom_config.h"
config_line=$(grep "${aom_config_option}" "${aom_config_file}")
if echo "${config_line}" | egrep -q '1$'; then
echo yes
diff --git a/test/transform_test_base.h b/test/transform_test_base.h
index 16d003d..67e8faf 100644
--- a/test/transform_test_base.h
+++ b/test/transform_test_base.h
@@ -12,7 +12,8 @@
#ifndef TEST_TRANSFORM_TEST_BASE_H_
#define TEST_TRANSFORM_TEST_BASE_H_
-#include "./aom_config.h"
+#include "config/aom_config.h"
+
#include "aom_mem/aom_mem.h"
#include "aom/aom_codec.h"
#include "aom_dsp/txfm_common.h"
diff --git a/test/variance_test.cc b/test/variance_test.cc
index ddbdddf..97ea5ad 100644
--- a/test/variance_test.cc
+++ b/test/variance_test.cc
@@ -14,8 +14,9 @@
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
-#include "./aom_config.h"
+#include "config/aom_config.h"
#include "./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/y4m_test.cc b/test/y4m_test.cc
index ad901d9..e8848fe 100644
--- a/test/y4m_test.cc
+++ b/test/y4m_test.cc
@@ -13,7 +13,8 @@
#include "third_party/googletest/src/googletest/include/gtest/gtest.h"
-#include "./aom_config.h"
+#include "config/aom_config.h"
+
#include "./y4menc.h"
#include "test/md5_helper.h"
#include "test/util.h"
