summaryrefslogtreecommitdiffstats
path: root/encoder.arm.mk
diff options
context:
space:
mode:
authorMartin Storsjo <martin@martin.st>2015-06-10 11:31:35 +0300
committerMarco Nelissen <marcone@google.com>2015-06-24 20:46:19 +0000
commit1a6481fb1bdb726d0286c70d2ddb48feb53665a1 (patch)
treea5989dc638b52ae2a47c177d7800b9af49b0577e /encoder.arm.mk
parenta61d4e01086ee399f1cd773ae73a418c42652bc8 (diff)
downloadandroid_external_libavc-1a6481fb1bdb726d0286c70d2ddb48feb53665a1.tar.gz
android_external_libavc-1a6481fb1bdb726d0286c70d2ddb48feb53665a1.tar.bz2
android_external_libavc-1a6481fb1bdb726d0286c70d2ddb48feb53665a1.zip
Allow using the clang built-in arm assembler
The arm and armv8 assembly source should now build just fine with clang's built-in assembler. Change-Id: I26d2a74d05e56e6e93457299d4d8ab082368701f
Diffstat (limited to 'encoder.arm.mk')
-rw-r--r--encoder.arm.mk4
1 files changed, 0 insertions, 4 deletions
diff --git a/encoder.arm.mk b/encoder.arm.mk
index 2a09ac2..f06a6d5 100644
--- a/encoder.arm.mk
+++ b/encoder.arm.mk
@@ -44,7 +44,3 @@ 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)
-
-# CLANG WORKAROUNDS
-LOCAL_CLANG_ASFLAGS_arm += -no-integrated-as
-LOCAL_CLANG_ASFLAGS_arm += $(addprefix -Wa$(comma)-I,$(libavce_inc_dir_arm))