vlc/vlc-3.0 | branch: master | Victorien Le Couviour--Tuffet <[email protected]> | Tue Sep 18 17:36:56 2018 +0200| [de7dac813f891737b9332ec3894eb0bef66372ca] | committer: Thomas Guillem
contrib: aom: fix cpu detection Fixes android NDK 17 build (cherry picked from commit ea1c82c6588e81a4e877924746f5660143693e84) Signed-off-by: Thomas Guillem <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=de7dac813f891737b9332ec3894eb0bef66372ca --- contrib/src/aom/rules.mak | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/contrib/src/aom/rules.mak b/contrib/src/aom/rules.mak index 53d94f3d21..2cedf05749 100644 --- a/contrib/src/aom/rules.mak +++ b/contrib/src/aom/rules.mak @@ -71,6 +71,16 @@ AOM_CONF += -DAOM_TARGET_CPU=armv7 endif endif +# Force cpu detection +ifdef HAVE_ANDROID +ifeq ($(ARCH),arm) +AOM_CONF += -DAOM_TARGET_CPU=armv7 +endif +ifeq ($(ARCH),aarch64) +AOM_CONF += -DAOM_TARGET_CPU=arm64 +endif +endif + # libaom doesn't allow in-tree builds .aom: aom toolchain.cmake cd $< && mkdir -p aom_build _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
