diff options
| author | Chih-Hung Hsieh <chh@google.com> | 2014-10-07 11:10:24 -0700 |
|---|---|---|
| committer | Chih-hung Hsieh <chh@google.com> | 2014-10-10 16:38:14 +0000 |
| commit | da04af4e1bd193808c2a38024732bf72e87ef714 (patch) | |
| tree | 23fdbaa784084a8c4de78d134af920673b1d19fa | |
| parent | 9921efda82d7b1f6410ad01c2cb4549b3bc1bb5c (diff) | |
| download | android_external_libvpx-da04af4e1bd193808c2a38024732bf72e87ef714.tar.gz android_external_libvpx-da04af4e1bd193808c2a38024732bf72e87ef714.tar.bz2 android_external_libvpx-da04af4e1bd193808c2a38024732bf72e87ef714.zip | |
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
| -rw-r--r-- | libvpx.mk | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -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 |