commit 91f9bc5c87b5bec88a08429e8fc3f9fb5b707a1d
author Lajos Molnar <lajos@google.com> Thu Apr 16 11:28:02 2015 -0700
committer Lajos Molnar <lajos@google.com> Thu Apr 16 11:49:47 2015 -0700
tree b28be6055ed381fc3c4222bf4818c9d5d095ad96
parent 73558f684bd4b634e8b785851b6cc3c6c065fbde

fix build for generic builds

Change-Id: I25ec2b8b6d0517097678b62fe4dcd286bf746d24

decoder/arm/impeg2d_function_selector.c

diff --git a/decoder/arm/impeg2d_function_selector.c b/decoder/arm/impeg2d_function_selector.c
index d43e060..bc6a688 100644
--- a/decoder/arm/impeg2d_function_selector.c
+++ b/decoder/arm/impeg2d_function_selector.c
@@ -79,24 +79,26 @@
 
     switch(e_proc_arch)
     {
-        case ARCH_ARM_NONEON:
-            impeg2d_init_function_ptr_generic(ps_codec);
+#if defined(ARMV8)
+        case ARCH_ARMV8_GENERIC:
+        default:
+            impeg2d_init_function_ptr_av8(ps_codec);
             break;
-#ifndef ARMV8
+#elif !defined(DISABLE_NEON)
         case ARCH_ARM_A5:
         case ARCH_ARM_A7:
         case ARCH_ARM_A9:
         case ARCH_ARM_A15:
         case ARCH_ARM_A9Q:
         default:
-        impeg2d_init_function_ptr_a9q(ps_codec);
+            impeg2d_init_function_ptr_a9q(ps_codec);
             break;
-#else /* ARMV8 */
-        case ARCH_ARMV8_GENERIC:
+#else
         default:
-            impeg2d_init_function_ptr_av8(ps_codec);
+#endif
+        case ARCH_ARM_NONEON:
+            impeg2d_init_function_ptr_generic(ps_codec);
             break;
-#endif /* ARMV8 */
     }
 }