diff options
| author | Chih-Hung Hsieh <chh@google.com> | 2014-10-10 20:30:52 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-10 20:30:52 +0000 |
| commit | acfe8bb381dd96f2a1cfe44c882ecd06fbce27f1 (patch) | |
| tree | 875bc70458b8e1fdd7d45bc4caecffe0ac623dc4 | |
| parent | 0e7430e0f21c927ef7c81ccc3cdbb557a1a92556 (diff) | |
| parent | 7fb54bb13de3ee9c7d769f7599bc157aebb178ff (diff) | |
| download | android_external_libvpx-acfe8bb381dd96f2a1cfe44c882ecd06fbce27f1.tar.gz android_external_libvpx-acfe8bb381dd96f2a1cfe44c882ecd06fbce27f1.tar.bz2 android_external_libvpx-acfe8bb381dd96f2a1cfe44c882ecd06fbce27f1.zip | |
am 7fb54bb1: Merge "Add -no-integrated-as at local level."
* commit '7fb54bb13de3ee9c7d769f7599bc157aebb178ff':
Add -no-integrated-as at local level.
| -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 |