From da04af4e1bd193808c2a38024732bf72e87ef714 Mon Sep 17 00:00:00 2001
From: Chih-Hung Hsieh <chh@google.com>
Date: Tue, 7 Oct 2014 11:10:24 -0700
Subject: Add -no-integrated-as at local level.

Later we will enable integrated-as as default at the global level.

Also pass include path explicitly to the GCC assembler.
Unlike gcc, clang doesn't pass -I flags on to the assembler - causing
the .include statements not to find the generated asm files.

This is reported as a bug in clang at
http://llvm.org/bugs/show_bug.cgi?id=21000

BUG: 17820427
BUG: 17137906
Change-Id: I788f3c8a3ca71948476c469b21dfda14483d269d
---
 libvpx.mk | 6 ++++++
 1 file changed, 6 insertions(+)

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
-- 
cgit v1.2.3