summaryrefslogtreecommitdiffstats
path: root/encoder.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 /encoder.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 'encoder.arm.mk')
-rwxr-xr-xencoder.arm.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/encoder.arm.mk b/encoder.arm.mk
index 81ed22f..b41c5ea 100755
--- a/encoder.arm.mk
+++ b/encoder.arm.mk
@@ -25,7 +25,6 @@ libavce_srcs_asm_arm += common/arm/ih264_inter_pred_luma_bilinear_a9q.s
libavce_srcs_asm_arm += common/arm/ih264_inter_pred_luma_copy_a9q.s
libavce_srcs_asm_arm += common/arm/ih264_padding_neon.s
libavce_srcs_asm_arm += common/arm/ih264_mem_fns_neon.s
-libavce_srcs_asm_arm += common/arm/ih264_arm_memory_barrier.s
libavce_srcs_asm_arm += encoder/arm/ih264e_evaluate_intra16x16_modes_a9q.s
libavce_srcs_asm_arm += encoder/arm/ih264e_evaluate_intra4x4_modes_a9q.s
@@ -42,6 +41,8 @@ else #No Neon
libavce_cflags_arm += -DDISABLE_NEON -DDEFAULT_ARCH=D_ARCH_ARM_NONEON
endif #Neon check
+libavce_srcs_asm_arm += common/arm/ih264_arm_memory_barrier.s
+
LOCAL_SRC_FILES_arm += $(libavce_srcs_c_arm) $(libavce_srcs_asm_arm)
LOCAL_C_INCLUDES_arm += $(libavce_inc_dir_arm)
LOCAL_CFLAGS_arm += $(libavce_cflags_arm)