commit abd1881db9cd61f13375c760b7fdae9219729c47
author Colin Cross <ccross@android.com> Tue Sep 22 22:22:20 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Sep 22 22:22:20 2015 +0000
tree 3c98e2e95d10082ec818324192be65728c7c5554
parent 4ec72fb10684276b048d5b3a6ba7a88d43b06411
parent ceb214959c6af1945c48599feb0e6b8e4e42c1e0

am ceb21495: Merge "Fix libvpx clang build"

* commit 'ceb214959c6af1945c48599feb0e6b8e4e42c1e0':
  Fix libvpx clang build

libvpx.mk

diff --git a/libvpx.mk b/libvpx.mk
index af19650..0e738bc 100644
--- a/libvpx.mk
+++ b/libvpx.mk
@@ -4,8 +4,10 @@
 # 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