From fab9a811d267f2c71bd031512e2a230cea1fb96f Mon Sep 17 00:00:00 2001
From: Lajos Molnar <lajos@google.com>
Date: Thu, 16 Apr 2015 18:47:11 -0700
Subject: [PATCH] fix build issues with clang

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

Change-Id: Idceb43f22b6fc26ec31de910482cdac62b6bbe86
---
 decoder.arm.mk   | 4 ++++
 decoder.arm64.mk | 4 ++++
 encoder.arm.mk   | 4 ++++
 encoder.arm64.mk | 4 ++++
 4 files changed, 16 insertions(+)

diff --git a/decoder.arm.mk b/decoder.arm.mk
index 7e14564..556e838 100755
--- a/decoder.arm.mk
+++ b/decoder.arm.mk
@@ -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))
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))
diff --git a/encoder.arm.mk b/encoder.arm.mk
index b41c5ea..874c81c 100755
--- a/encoder.arm.mk
+++ b/encoder.arm.mk
@@ -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))
diff --git a/encoder.arm64.mk b/encoder.arm64.mk
index 845b481..99dbb06 100755
--- a/encoder.arm64.mk
+++ b/encoder.arm64.mk
@@ -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))