summaryrefslogtreecommitdiffstats
path: root/decoder.arm64.mk
diff options
context:
space:
mode:
authorLajos Molnar <lajos@google.com>2015-04-16 18:47:11 -0700
committerLajos Molnar <lajos@google.com>2015-04-16 18:55:35 -0700
commitfab9a811d267f2c71bd031512e2a230cea1fb96f (patch)
tree91f724fa20b6e3cd6007f26d23112c59ed425e9f /decoder.arm64.mk
parent7023f4d0e96b562046608aeb15e755778b3b8713 (diff)
downloadandroid_external_libavc-fab9a811d267f2c71bd031512e2a230cea1fb96f.tar.gz
android_external_libavc-fab9a811d267f2c71bd031512e2a230cea1fb96f.tar.bz2
android_external_libavc-fab9a811d267f2c71bd031512e2a230cea1fb96f.zip
fix build issues with clang
Disable clang for assembly, and pass include paths to clang-assembly in a clang way Change-Id: Idceb43f22b6fc26ec31de910482cdac62b6bbe86
Diffstat (limited to 'decoder.arm64.mk')
-rwxr-xr-xdecoder.arm64.mk4
1 files changed, 4 insertions, 0 deletions
diff --git a/decoder.arm64.mk b/decoder.arm64.mk
index 7a06163..ddf0ad2 100755
--- a/decoder.arm64.mk
+++ b/decoder.arm64.mk
@@ -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))