vlc | branch: master | Hugo Beauzée-Luyssen <[email protected]> | Fri Jan 11 12:04:07 2019 +0100| [dba2a1a8edf6f72b7aa22c2d30f880ef548faf8f] | committer: Hugo Beauzée-Luyssen
contrib: iconv: iconv is not available before API 28 > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=dba2a1a8edf6f72b7aa22c2d30f880ef548faf8f --- contrib/src/iconv/rules.mak | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/contrib/src/iconv/rules.mak b/contrib/src/iconv/rules.mak index c998fd81fc..0a70d22e6b 100644 --- a/contrib/src/iconv/rules.mak +++ b/contrib/src/iconv/rules.mak @@ -6,7 +6,13 @@ PKGS += iconv # iconv cannot be detect with pkg-config, but it is mandated by POSIX. # Hard-code based on the operating system. ifndef HAVE_WIN32 +ifndef HAVE_ANDROID PKGS_FOUND += iconv +else +ifeq ($(shell echo "$(ANDROID_API) >= 28" | bc), 1) +PKGS_FOUND += iconv +endif +endif endif $(TARBALLS)/libiconv-$(LIBICONV_VERSION).tar.gz: _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
