summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChih-Hung Hsieh <chh@google.com>2014-10-10 20:23:11 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-10-10 20:23:11 +0000
commit7fb54bb13de3ee9c7d769f7599bc157aebb178ff (patch)
tree23fdbaa784084a8c4de78d134af920673b1d19fa
parent9921efda82d7b1f6410ad01c2cb4549b3bc1bb5c (diff)
parentda04af4e1bd193808c2a38024732bf72e87ef714 (diff)
downloadandroid_external_libvpx-7fb54bb13de3ee9c7d769f7599bc157aebb178ff.tar.gz
android_external_libvpx-7fb54bb13de3ee9c7d769f7599bc157aebb178ff.tar.bz2
android_external_libvpx-7fb54bb13de3ee9c7d769f7599bc157aebb178ff.zip
Merge "Add -no-integrated-as at local level."
-rw-r--r--libvpx.mk6
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