fix build issues with clang
Disable clang for assembly, and pass include paths to clang-assembly in a clang way
Change-Id: Id0e4f433cd0b7f28addf50b36e2bce29e7fba3a8
diff --git a/decoder.arm.mk b/decoder.arm.mk
index 6e02ce8..5f59681 100644
--- a/decoder.arm.mk
+++ b/decoder.arm.mk
@@ -20,3 +20,7 @@
LOCAL_SRC_FILES_arm += $(libmpeg2d_srcs_c_arm) $(libmpeg2d_srcs_asm_arm)
LOCAL_C_INCLUDES_arm += $(libmpeg2d_inc_dir_arm)
LOCAL_CFLAGS_arm += $(libmpeg2d_cflags_arm)
+
+# CLANG WORKAROUNDS
+LOCAL_CLANG_ASFLAGS_arm += -no-integrated-as
+LOCAL_CLANG_ASFLAGS_arm += $(addprefix -Wa$(comma)-I,$(libmpeg2d_inc_dir_arm))
diff --git a/decoder.arm64.mk b/decoder.arm64.mk
index f3a36e6..bcb6d55 100644
--- a/decoder.arm64.mk
+++ b/decoder.arm64.mk
@@ -24,8 +24,8 @@
LOCAL_SRC_FILES_arm64 += $(libmpeg2d_srcs_c_arm64) $(libmpeg2d_srcs_asm_arm64)
LOCAL_C_INCLUDES_arm64 += $(libmpeg2d_inc_dir_arm64)
-
-comma := ,
-LOCAL_ASFLAGS_arm64 += $(addprefix -Wa$(comma)-I,$(libmpeg2d_inc_dir_arm64))
-
LOCAL_CFLAGS_arm64 += $(libmpeg2d_cflags_arm64)
+
+# CLANG WORKAROUNDS
+LOCAL_CLANG_ASFLAGS_arm64 += -no-integrated-as
+LOCAL_CLANG_ASFLAGS_arm64 += $(addprefix -Wa$(comma)-I,$(libmpeg2d_inc_dir_arm64))
