diff options
| author | Ray Essick <essick@google.com> | 2016-12-06 23:09:08 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-12-06 23:09:09 +0000 |
| commit | 41c0f84e92f681e3258a74e20a0278f4a84f12fd (patch) | |
| tree | 7f40bb8f7244b7722b15b83711a487ccb6be3c49 | |
| parent | fef5e9e203fd2686b395a226f1909c6a704375f3 (diff) | |
| parent | ad7f0036a74b3e354894dd3a6cdd3d78ea1276ac (diff) | |
| download | libavc-o-preview.tar.gz | |
Merge "Remove ARCH_ARM_HAVE_NEON dependency from arm64"android-o-preview-1android-n-mr2-preview-2android-n-mr2-preview-1o-preview
| -rw-r--r-- | decoder.arm64.mk | 6 | ||||
| -rw-r--r-- | encoder.arm64.mk | 7 |
2 files changed, 0 insertions, 13 deletions
diff --git a/decoder.arm64.mk b/decoder.arm64.mk index 2140b94..5ccf70f 100644 --- a/decoder.arm64.mk +++ b/decoder.arm64.mk @@ -6,7 +6,6 @@ libavcd_inc_dir_arm64 += $(LOCAL_PATH)/common/armv8 libavcd_srcs_c_arm64 += decoder/arm/ih264d_function_selector.c -ifeq ($(ARCH_ARM_HAVE_NEON),true) libavcd_srcs_c_arm64 += decoder/arm/ih264d_function_selector_av8.c libavcd_srcs_asm_arm64 += common/armv8/ih264_intra_pred_chroma_av8.s @@ -34,11 +33,6 @@ libavcd_srcs_asm_arm64 += common/armv8/ih264_ihadamard_scaling_av8.s libavcd_srcs_asm_arm64 += common/armv8/ih264_intra_pred_luma_8x8_av8.s libavcd_cflags_arm64 += -DDEFAULT_ARCH=D_ARCH_ARMV8_GENERIC -else -libavcd_cflags_arm64 += -DDISABLE_NEON -DDEFAULT_ARCH=D_ARCH_ARM_NONEON -endif - - LOCAL_SRC_FILES_arm64 += $(libavcd_srcs_c_arm64) $(libavcd_srcs_asm_arm64) diff --git a/encoder.arm64.mk b/encoder.arm64.mk index f95a29f..73cce1b 100644 --- a/encoder.arm64.mk +++ b/encoder.arm64.mk @@ -7,7 +7,6 @@ libavce_inc_dir_arm64 += $(LOCAL_PATH)/common/armv8 libavce_srcs_c_arm64 += encoder/arm/ih264e_function_selector.c -ifeq ($(ARCH_ARM_HAVE_NEON),true) libavce_srcs_c_arm64 += encoder/arm/ih264e_function_selector_av8.c libavce_srcs_asm_arm64 += common/armv8/ih264_resi_trans_quant_av8.s @@ -35,12 +34,6 @@ libavce_srcs_asm_arm64 += encoder/armv8/ih264e_half_pel_av8.s #ME libavce_srcs_asm_arm64 += encoder/armv8/ime_distortion_metrics_av8.s -else -libavce_cflags_arm64 += -DDISABLE_NEON -endif - - - LOCAL_SRC_FILES_arm64 += $(libavce_srcs_c_arm64) $(libavce_srcs_asm_arm64) LOCAL_C_INCLUDES_arm64 += $(libavce_inc_dir_arm64) |