Move build guard to the build system
Change-Id: I62f7dca3d0d5aa9648c8a444f11f0f2a8bb3845b
diff --git a/test/coding_path_sync.cc b/test/coding_path_sync.cc
index 175f1ee..f4bd4b8 100644
--- a/test/coding_path_sync.cc
+++ b/test/coding_path_sync.cc
@@ -15,8 +15,6 @@
#include "./aom_config.h"
-#if CONFIG_AV1_ENCODER && CONFIG_AV1_DECODER
-
#include "aom_ports/mem.h" // ROUND_POWER_OF_TWO
#include "aom/aomcx.h"
#include "aom/aomdx.h"
@@ -152,5 +150,3 @@
}
} // namespace
-
-#endif
diff --git a/test/test.cmake b/test/test.cmake
index b73feb6..43b975c 100644
--- a/test/test.cmake
+++ b/test/test.cmake
@@ -287,6 +287,7 @@
${AOM_UNIT_TEST_COMMON_SOURCES}
"${AOM_ROOT}/test/divu_small_test.cc"
"${AOM_ROOT}/test/ethread_test.cc"
+ "${AOM_ROOT}/test/coding_path_sync.cc"
"${AOM_ROOT}/test/idct8x8_test.cc"
"${AOM_ROOT}/test/partial_idct_test.cc"
"${AOM_ROOT}/test/superframe_test.cc"
diff --git a/test/test.mk b/test/test.mk
index 7292575..2f99ab7 100644
--- a/test/test.mk
+++ b/test/test.mk
@@ -33,7 +33,6 @@
LIBAOM_TEST_SRCS-$(CONFIG_AV1_ENCODER) += aq_segment_test.cc
LIBAOM_TEST_SRCS-$(CONFIG_AV1_ENCODER) += datarate_test.cc
LIBAOM_TEST_SRCS-$(CONFIG_AV1_ENCODER) += encode_api_test.cc
-LIBAOM_TEST_SRCS-$(CONFIG_AV1_ENCODER) += coding_path_sync.cc
LIBAOM_TEST_SRCS-$(CONFIG_AV1_ENCODER) += error_resilience_test.cc
LIBAOM_TEST_SRCS-$(CONFIG_AV1_ENCODER) += i420_video_source.h
#LIBAOM_TEST_SRCS-$(CONFIG_AV1_ENCODER) += realtime_test.cc
@@ -107,6 +106,7 @@
# These tests require both the encoder and decoder to be built.
ifeq ($(CONFIG_AV1_ENCODER)$(CONFIG_AV1_DECODER),yesyes)
# IDCT test currently depends on FDCT function
+LIBAOM_TEST_SRCS-yes += coding_path_sync.cc
LIBAOM_TEST_SRCS-yes += idct8x8_test.cc
LIBAOM_TEST_SRCS-yes += partial_idct_test.cc
LIBAOM_TEST_SRCS-yes += superframe_test.cc