1 files changed, 6 insertions, 0 deletions
diff --git a/libvpx.mk b/libvpx.mk
index db2060e..1b25fc7 100644
--- a/libvpx.mk
+++ b/libvpx.mk
@@ -1,6 +1,12 @@
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
+# Clang arm assembler cannot compile libvpx .s files yet.
+LOCAL_CLANG_ASFLAGS_arm += -no-integrated-as
+# Pass incude path to GCC assembler.
+LOCAL_CLANG_ASFLAGS := \
+     -Wa,-I$(TARGET_OUT_INTERMEDIATES)/STATIC_LIBRARIES/libvpx_intermediates/vp8/encoder
+
 libvpx_source_dir := $(LOCAL_PATH)/libvpx
 
 ## Arch-common settings