Guard selfguided_hwy.h with CONFIG_HIGHWAY

Change-Id: Ic240254d39f79c7dfec3ec1feefc934adb01d87f
diff --git a/av1/av1.cmake b/av1/av1.cmake
index c1194b9..068ebba 100644
--- a/av1/av1.cmake
+++ b/av1/av1.cmake
@@ -80,7 +80,6 @@
             "${AOM_ROOT}/av1/common/scan.h"
             "${AOM_ROOT}/av1/common/seg_common.c"
             "${AOM_ROOT}/av1/common/seg_common.h"
-            "${AOM_ROOT}/av1/common/selfguided_hwy.h"
             "${AOM_ROOT}/av1/common/thread_common.c"
             "${AOM_ROOT}/av1/common/thread_common.h"
             "${AOM_ROOT}/av1/common/tile_common.c"
@@ -93,6 +92,10 @@
             "${AOM_ROOT}/av1/common/warped_motion.c"
             "${AOM_ROOT}/av1/common/warped_motion.h")
 
+if(CONFIG_HIGHWAY)
+  list(APPEND AOM_AV1_COMMON_SOURCES "${AOM_ROOT}/av1/common/selfguided_hwy.h")
+endif()
+
 list(APPEND AOM_AV1_DECODER_SOURCES
             "${AOM_ROOT}/av1/av1_dx_iface.c"
             "${AOM_ROOT}/av1/decoder/decodeframe.c"
@@ -581,6 +584,7 @@
                      "${AOM_ROOT}/av1/common/cfl.h"
                      "${AOM_ROOT}/av1/common/restoration.c"
                      "${AOM_ROOT}/av1/common/restoration.h"
+                     "${AOM_ROOT}/av1/common/selfguided_hwy.h"
                      "${AOM_ROOT}/av1/common/warped_motion.c"
                      "${AOM_ROOT}/av1/common/warped_motion.h")