diff options
| author | Greg Hackmann <ghackmann@google.com> | 2014-08-09 12:07:32 -0700 |
|---|---|---|
| committer | Greg Hackmann <ghackmann@google.com> | 2014-08-09 13:21:59 -0700 |
| commit | a90d9a91923f2980c49ec34b805e7a910979f96a (patch) | |
| tree | 4ea698beaf7f7bd2d18c448b93f38a830180213c | |
| parent | 6c166a9e18156d364d0704fccbd53a7dc022e97d (diff) | |
| download | android_external_libhevc-staging/cm-12.0-caf.tar.gz android_external_libhevc-staging/cm-12.0-caf.tar.bz2 android_external_libhevc-staging/cm-12.0-caf.zip | |
Fix arm64 buildstaging/cm-12.0-cafstaging/cm-12.0
ARCH_ARM_HAVE_NEON only applies to ARMv7 targets, since ARMv8 requires
NEON support. It may be set anyway on some targets but this shouldn't
be relied on.
Also fix DEFAULT_ARCH not getting set, which currently works anyway but
mostly by accident (ihevcd_init_function_ptr() falls back on the case we
happen to want).
Change-Id: Ided35523f83fdffca313e2bcb71470cdf780fa55
Signed-off-by: Greg Hackmann <ghackmann@google.com>
| -rw-r--r-- | decoder.arm64.mk | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/decoder.arm64.mk b/decoder.arm64.mk index 8714aaf..316cc26 100644 --- a/decoder.arm64.mk +++ b/decoder.arm64.mk @@ -9,7 +9,6 @@ libhevcd_inc_dir_arm64 += $(LOCAL_PATH)/common/arm64 libhevcd_srcs_c_arm64 += decoder/arm/ihevcd_function_selector.c libhevcd_srcs_c_arm64 += decoder/arm/ihevcd_function_selector_noneon.c -ifeq ($(ARCH_ARM_HAVE_NEON),true) libhevcd_srcs_c_arm64 += decoder/arm64/ihevcd_function_selector_av8.c libhevcd_srcs_c_arm64 += common/arm/ihevc_intra_pred_filters_neon_intr.c @@ -84,10 +83,7 @@ libhevcd_srcs_asm_arm64 += decoder/arm64/ihevcd_fmt_conv_420sp_to_420p.s libhevcd_srcs_asm_arm64 += decoder/arm64/ihevcd_fmt_conv_420sp_to_420sp.s libhevcd_srcs_asm_arm64 += decoder/arm64/ihevcd_fmt_conv_420sp_to_rgba8888.s -libhevcd_cflags_arm += -DDEFAULT_ARCH=D_ARCH_ARMV8_GENERIC -else -libhevcd_cflags_arm64 += -DDISABLE_NEON -DDEFAULT_ARCH=D_ARCH_ARM_NONEON -endif +libhevcd_cflags_arm64 += -DDEFAULT_ARCH=D_ARCH_ARMV8_GENERIC |