Skip to content
Snippets Groups Projects
Commit c91faebe authored by Adrien Béraud's avatar Adrien Béraud
Browse files

contrib: fix vpx build on Android x86_64 

Change-Id: I847f324d6836eb78df385b8e09465dbbcc40124a
parent eab08ce2
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
contrib/src/vpx/rules.mak
+ 3
− 5
View file @ c91faebe
...@@ -81,6 +81,7 @@ endif ...@@ -81,6 +81,7 @@ endif
VPX_CONF := \ VPX_CONF := \
--as=yasm \ --as=yasm \
--disable-docs \ --disable-docs \
--disable-tools \
--disable-examples \ --disable-examples \
--disable-unit-tests \ --disable-unit-tests \
--disable-install-bins \ --disable-install-bins \
...@@ -89,9 +90,6 @@ VPX_CONF := \ ...@@ -89,9 +90,6 @@ VPX_CONF := \
--enable-error-concealment \ --enable-error-concealment \
--disable-webm-io --disable-webm-io
ifdef HAVE_ANDROID
VPX_CONF += --disable-runtime-cpu-detect
endif
ifdef HAVE_IOS ifdef HAVE_IOS
VPX_CONF += --disable-runtime-cpu-detect VPX_CONF += --disable-runtime-cpu-detect
endif endif
...@@ -101,8 +99,8 @@ VPX_CONF += --enable-pic ...@@ -101,8 +99,8 @@ VPX_CONF += --enable-pic
endif endif
LOCAL_HOSTVARS= LOCAL_HOSTVARS=
ifdef HAVE_ANDROID ifdef HAVE_ANDROID
VPX_CONF += --disable-tools --extra-cflags="-I$(ANDROID_NDK)/sources/cpufeatures/ -fvisibility=hidden" VPX_CONF += --disable-tools --extra-cflags="-I$(ANDROID_NDK)/sources/android/cpufeatures/ -fvisibility=hidden"
LOCAL_HOSTVARS=$(HOSTVARS) LOCAL_HOSTVARS=$(HOSTVARS) LD=$(CC)
endif endif
ifdef HAVE_WIN32 ifdef HAVE_WIN32
ifeq ($(ARCH),i386) ifeq ($(ARCH),i386)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment