diff options
| author | Colin Cross <ccross@android.com> | 2015-09-22 22:22:20 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-22 22:22:20 +0000 |
| commit | abd1881db9cd61f13375c760b7fdae9219729c47 (patch) | |
| tree | 3c98e2e95d10082ec818324192be65728c7c5554 | |
| parent | 4ec72fb10684276b048d5b3a6ba7a88d43b06411 (diff) | |
| parent | ceb214959c6af1945c48599feb0e6b8e4e42c1e0 (diff) | |
| download | platform_external_libvpx-brillo-m7-release.tar.gz platform_external_libvpx-brillo-m7-release.tar.bz2 platform_external_libvpx-brillo-m7-release.zip | |
am ceb21495: Merge "Fix libvpx clang build"brillo-m7-releasebrillo-m7-mr-devbrillo-m7-dev
* commit 'ceb214959c6af1945c48599feb0e6b8e4e42c1e0':
Fix libvpx clang build
| -rw-r--r-- | libvpx.mk | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -4,8 +4,10 @@ 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 := \ +LOCAL_CLANG_ASFLAGS_$(TARGET_ARCH) += \ -Wa,-I$(TARGET_OUT_INTERMEDIATES)/STATIC_LIBRARIES/libvpx_intermediates/vp8/encoder +LOCAL_CLANG_ASFLAGS_$(TARGET_2ND_ARCH) += \ + -Wa,-I$($(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_INTERMEDIATES)/STATIC_LIBRARIES/libvpx_intermediates/vp8/encoder # vp9_mcomp.c:93:10: error: address of array 'x->nmvsadcost' will always evaluate to 'true' LOCAL_CLANG_CFLAGS += -Wno-pointer-bool-conversion |