fix build issues with clang

Disable clang for assembly, and pass include paths to clang-assembly in a clang way

Change-Id: Idceb43f22b6fc26ec31de910482cdac62b6bbe86
This commit is contained in:
Lajos Molnar 2015-04-16 18:47:11 -07:00
parent 7023f4d0e9
commit fab9a811d2
4 changed files with 16 additions and 0 deletions

View file

@ -43,3 +43,7 @@ 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))

View file

@ -44,3 +44,7 @@ endif
LOCAL_SRC_FILES_arm64 += $(libavcd_srcs_c_arm64) $(libavcd_srcs_asm_arm64)
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))

View file

@ -46,3 +46,7 @@ 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))

View file

@ -46,3 +46,7 @@ endif
LOCAL_SRC_FILES_arm64 += $(libavce_srcs_c_arm64) $(libavce_srcs_asm_arm64)
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))