aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChih-Wei Huang <cwhuang@linux.org.tw>2016-05-19 14:00:15 +0800
committerChih-Wei Huang <cwhuang@android-x86.org>2016-05-19 19:02:46 +0800
commitc459d7c8c2cb7225b90e37dbae95a52a6cfb68b9 (patch)
treeb6422f83bcbf3432fe0f0797ee63e05d34c82119
parentf3bec54b7e7a7b0441e3ea2a2737cbf418340ea1 (diff)
downloadandroid_external_ffmpeg-stable/cm-13.0-ZNH5Y.tar.gz
android_external_ffmpeg-stable/cm-13.0-ZNH5Y.tar.bz2
android_external_ffmpeg-stable/cm-13.0-ZNH5Y.zip
android: x86: use AOSP's YASMstable/cm-13.0-ZNH5Y
The current definition relies on the yasm of the host. It is unnecessary. Just remove the definition to use AOSP's YASM. Change-Id: I004e6123b70c7a33c85b275e7d805a3be8789b76
-rw-r--r--android/config-x86.mak3
1 files changed, 1 insertions, 2 deletions
diff --git a/android/config-x86.mak b/android/config-x86.mak
index 0ec024e693..2d7c14a06f 100644
--- a/android/config-x86.mak
+++ b/android/config-x86.mak
@@ -28,8 +28,7 @@ DEPCC=../../prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/bin/x86_64-linu
DEPCCFLAGS= $(CPPFLAGS)
DEPAS=../../prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/bin/x86_64-linux-android-gcc
DEPASFLAGS= $(CPPFLAGS)
-YASM=yasm
-DEPYASM=yasm
+DEPYASM=$(YASM)
AR=../../prebuilts/gcc/linux-x86/x86/x86_64-linux-android-4.9/bin/x86_64-linux-android-ar
ARFLAGS=rcD
AR_O=$@