summaryrefslogtreecommitdiffstats
path: root/decoder.arm.mk
diff options
context:
space:
mode:
authorLajos Molnar <lajos@google.com>2015-04-16 11:37:41 -0700
committerLajos Molnar <lajos@google.com>2015-04-16 11:54:42 -0700
commit7023f4d0e96b562046608aeb15e755778b3b8713 (patch)
treeb205753dcd0e04ac29faa9965e29d4c17c093f4f /decoder.arm.mk
parent7e7f176198dae244193b47574751193de1f431f0 (diff)
downloadandroid_external_libavc-7023f4d0e96b562046608aeb15e755778b3b8713.tar.gz
android_external_libavc-7023f4d0e96b562046608aeb15e755778b3b8713.tar.bz2
android_external_libavc-7023f4d0e96b562046608aeb15e755778b3b8713.zip
fix build for generic builds
Change-Id: I7654a801a2b168b7e0bcbebf680efbf2343b1ece
Diffstat (limited to 'decoder.arm.mk')
-rwxr-xr-xdecoder.arm.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/decoder.arm.mk b/decoder.arm.mk
index 80093e4..7e14564 100755
--- a/decoder.arm.mk
+++ b/decoder.arm.mk
@@ -32,13 +32,14 @@ libavcd_srcs_asm_arm += common/arm/ih264_padding_neon.s
libavcd_srcs_asm_arm += common/arm/ih264_iquant_itrans_recon_a9.s
libavcd_srcs_asm_arm += common/arm/ih264_iquant_itrans_recon_dc_a9.s
libavcd_srcs_asm_arm += common/arm/ih264_ihadamard_scaling_a9.s
-libavcd_srcs_asm_arm += common/arm/ih264_arm_memory_barrier.s
libavcd_cflags_arm += -DDEFAULT_ARCH=D_ARCH_ARM_A9Q
else
libavcd_cflags_arm += -DDISABLE_NEON -DDEFAULT_ARCH=D_ARCH_ARM_NONEON
endif
+libavcd_srcs_asm_arm += common/arm/ih264_arm_memory_barrier.s
+
LOCAL_SRC_FILES_arm += $(libavcd_srcs_c_arm) $(libavcd_srcs_asm_arm)
LOCAL_C_INCLUDES_arm += $(libavcd_inc_dir_arm)
LOCAL_CFLAGS_arm += $(libavcd_cflags_arm)