diff options
| author | Martin Storsjo <martin@martin.st> | 2015-06-10 11:31:35 +0300 |
|---|---|---|
| committer | Marco Nelissen <marcone@google.com> | 2015-06-25 08:25:48 -0700 |
| commit | c9f67e59b7d835e4899ae85fcca6ec58790551a0 (patch) | |
| tree | b4f942b8f48a5239db2e46bee6612adf1bcb52d2 | |
| parent | 3e4b6559bcb900eb20e4eafd0779a1f1641f31ac (diff) | |
| download | android_external_libavc-c9f67e59b7d835e4899ae85fcca6ec58790551a0.tar.gz android_external_libavc-c9f67e59b7d835e4899ae85fcca6ec58790551a0.tar.bz2 android_external_libavc-c9f67e59b7d835e4899ae85fcca6ec58790551a0.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
| -rw-r--r-- | decoder.arm.mk | 4 | ||||
| -rw-r--r-- | decoder.arm64.mk | 1 | ||||
| -rw-r--r-- | encoder.arm.mk | 4 | ||||
| -rw-r--r-- | encoder.arm64.mk | 1 |
4 files changed, 0 insertions, 10 deletions
diff --git a/decoder.arm.mk b/decoder.arm.mk index 07335cd..e5ac2d4 100644 --- a/decoder.arm.mk +++ b/decoder.arm.mk @@ -43,7 +43,3 @@ libavcd_srcs_asm_arm += common/arm/ih264_arm_memory_barrier.s LOCAL_SRC_FILES_arm += $(libavcd_srcs_c_arm) $(libavcd_srcs_asm_arm) LOCAL_C_INCLUDES_arm += $(libavcd_inc_dir_arm) LOCAL_CFLAGS_arm += $(libavcd_cflags_arm) - -# CLANG WORKAROUNDS -LOCAL_CLANG_ASFLAGS_arm += -no-integrated-as -LOCAL_CLANG_ASFLAGS_arm += $(addprefix -Wa$(comma)-I,$(libavcd_inc_dir_arm)) diff --git a/decoder.arm64.mk b/decoder.arm64.mk index 5d92ed0..2140b94 100644 --- a/decoder.arm64.mk +++ b/decoder.arm64.mk @@ -46,5 +46,4 @@ LOCAL_C_INCLUDES_arm64 += $(libavcd_inc_dir_arm64) LOCAL_CFLAGS_arm64 += $(libavcd_cflags_arm64) # CLANG WORKAROUNDS -LOCAL_CLANG_ASFLAGS_arm64 += -no-integrated-as LOCAL_CLANG_ASFLAGS_arm64 += $(addprefix -Wa$(comma)-I,$(libavcd_inc_dir_arm64)) 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)) diff --git a/encoder.arm64.mk b/encoder.arm64.mk index 74fcc69..f95a29f 100644 --- a/encoder.arm64.mk +++ b/encoder.arm64.mk @@ -47,5 +47,4 @@ LOCAL_C_INCLUDES_arm64 += $(libavce_inc_dir_arm64) LOCAL_CFLAGS_arm64 += $(libavce_cflags_arm64) # CLANG WORKAROUNDS -LOCAL_CLANG_ASFLAGS_arm64 += -no-integrated-as LOCAL_CLANG_ASFLAGS_arm64 += $(addprefix -Wa$(comma)-I,$(libavce_inc_dir_arm64)) |