summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Storsjo <martin@martin.st>2015-05-19 14:47:33 +0300
committerLajos Molnar <lajos@google.com>2015-06-03 08:43:52 -0700
commit50cb7d0fac943071221814c96643e2906b4a8c6e (patch)
treee9feac905810bbb7cb757f805c6bd87ff2d205b6
parentb30b70f9cc381f7973e7328a1f1964079b6c1adb (diff)
downloadandroid_external_libavc-50cb7d0fac943071221814c96643e2906b4a8c6e.tar.gz
android_external_libavc-50cb7d0fac943071221814c96643e2906b4a8c6e.tar.bz2
android_external_libavc-50cb7d0fac943071221814c96643e2906b4a8c6e.zip
Set cflags for the right arch in the arm64 makefile
Change-Id: I0b7c56670e93b825b95b84d7573b968c51313d2e
-rw-r--r--decoder.arm64.mk2
-rw-r--r--encoder.arm64.mk2
2 files changed, 2 insertions, 2 deletions
diff --git a/decoder.arm64.mk b/decoder.arm64.mk
index ddf0ad2..423c34d 100644
--- a/decoder.arm64.mk
+++ b/decoder.arm64.mk
@@ -33,7 +33,7 @@ libavcd_srcs_asm_arm64 += common/armv8/ih264_iquant_itrans_recon_dc_av8.s
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_arm += -DDEFAULT_ARCH=D_ARCH_ARMV8_GENERIC
+libavcd_cflags_arm64 += -DDEFAULT_ARCH=D_ARCH_ARMV8_GENERIC
else
libavcd_cflags_arm64 += -DDISABLE_NEON -DDEFAULT_ARCH=D_ARCH_ARM_NONEON
endif
diff --git a/encoder.arm64.mk b/encoder.arm64.mk
index 99dbb06..5d2d045 100644
--- a/encoder.arm64.mk
+++ b/encoder.arm64.mk
@@ -35,7 +35,7 @@ libavce_srcs_asm_arm64 += encoder/armv8/ih264e_half_pel_av8.s
#ME
libavce_srcs_asm_arm64 += encoder/armv8/ime_distortion_metrics_av8.s
-libavce_cflags_arm += -DDEFAULT_ARCH=D_ARCH_ARMV8_GENERIC
+libavce_cflags_arm64 += -DDEFAULT_ARCH=D_ARCH_ARMV8_GENERIC
else
libavce_cflags_arm64 += -DDISABLE_NEON -DDEFAULT_ARCH=D_ARCH_ARM_NONEON
endif