commit 345e48cc9f0c6c02d45330c728ce7da1b18dde4b
author Tom Finegan <tomfinegan@google.com> Fri Apr 28 10:00:04 2017 -0700
committer Tom Finegan <tomfinegan@google.com> Fri Apr 28 21:40:09 2017 +0000
tree 7ab3c95a18e38d4e9dfc09f4bd1695cd892c44b3
parent b642a46cf26f2a177cdbb69e60792c8776d3f458

Silence warnings in high bit depth av1 CMake build.

Sync with configure build: dct_neon.c and error_neon.c in
av1/encoder/arm/neon moved to the high bit depth build else.
They are only built when CONFIG_HIGHBITDEPTH is off.

Also moves both source files to AOM_AV1_COMMON_INTRIN_NEON
list since the configure build includes them in av1_{cx,dx}.mk.

Change-Id: Ie315e151438151f02a3aa5ef4757daf7d24f9028

av1/av1.cmake

diff --git a/av1/av1.cmake b/av1/av1.cmake
index 6700293..00f687a 100644
--- a/av1/av1.cmake
+++ b/av1/av1.cmake
@@ -216,11 +216,6 @@
       ${AOM_AV1_COMMON_INTRIN_AVX2}
       "${AOM_ROOT}/av1/common/x86/highbd_inv_txfm_avx2.c")
 
-  set(AOM_AV1_ENCODER_INTRIN_NEON
-      ${AOM_AV1_ENCODER_INTRIN_NEON}
-      "${AOM_ROOT}/av1/encoder/arm/neon/dct_neon.c"
-      "${AOM_ROOT}/av1/encoder/arm/neon/error_neon.c")
-
   set(AOM_AV1_ENCODER_INTRIN_SSE4_1
       ${AOM_AV1_ENCODER_INTRIN_SSE4_1}
       "${AOM_ROOT}/av1/encoder/x86/av1_highbd_quantize_sse4.c"
@@ -228,8 +223,13 @@
 else ()
   set(AOM_AV1_COMMON_INTRIN_NEON
       ${AOM_AV1_COMMON_INTRIN_NEON}
+      "${AOM_ROOT}/av1/encoder/arm/neon/dct_neon.c"
       "${AOM_ROOT}/av1/common/arm/neon/iht4x4_add_neon.c"
       "${AOM_ROOT}/av1/common/arm/neon/iht8x8_add_neon.c")
+
+  set(AOM_AV1_ENCODER_INTRIN_NEON
+      ${AOM_AV1_ENCODER_INTRIN_NEON}
+      "${AOM_ROOT}/av1/encoder/arm/neon/error_neon.c")
 endif ()
 
 if (CONFIG_CDEF)