summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordhacker29 <dhackerdvm@gmail.com>2015-04-08 23:26:31 -0400
committerdhacker29 <dhackerdvm@gmail.com>2015-04-09 07:01:02 -0400
commit3bead6224f8abd081a9db85d098aab999f0b787a (patch)
tree0eb4eea98462c0bdfcca8800c1eff3f1c15715c0
parent69f5594ef6a4a13fac8b001421b302a9a0b4a009 (diff)
downloadandroid_external_libvpx-3bead6224f8abd081a9db85d098aab999f0b787a.tar.gz
android_external_libvpx-3bead6224f8abd081a9db85d098aab999f0b787a.tar.bz2
android_external_libvpx-3bead6224f8abd081a9db85d098aab999f0b787a.zip
Use the prebuilts version of yasm to avoid host installstable/cm-12.1-YOG3C
For some reason YASM is getting redifined after being set in build/core/config.mk, so lets just make sure it's set again here. Change-Id: Iab42e048964289928e58a929a093f52aa6c4924f
-rw-r--r--config.x86.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/config.x86.mk b/config.x86.mk
index 5d604b9..038713b 100644
--- a/config.x86.mk
+++ b/config.x86.mk
@@ -5,6 +5,8 @@
libvpx_target := x86
+YASM := prebuilts/misc/$(BUILD_OS)-$(HOST_PREBUILT_ARCH)/yasm/yasm
+
libvpx_config_dir_x86 := $(LOCAL_PATH)/$(libvpx_target)
libvpx_codec_srcs := $(sort $(shell cat $(libvpx_config_dir_x86)/libvpx_srcs.txt))