[vlc-commits] Revert "contrib: define CMAKE_SYSTEM_NAME when building for Android"

Jean-Baptiste Kempf git at videolan.org
Fri Nov 18 19:27:39 CET 2016


vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Fri Nov 18 19:26:46 2016 +0100| [3c72453823b25b736fb284046d66359be9db4f2d] | committer: Jean-Baptiste Kempf

Revert "contrib: define CMAKE_SYSTEM_NAME when building for Android"

This reverts commit 6290ebf68b5f59b7c1b272c242e62377fee4b557.

It behaves badly depending on the CMake Version, and on our buildbots...

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=3c72453823b25b736fb284046d66359be9db4f2d
---

 contrib/src/main.mak | 1 -
 1 file changed, 1 deletion(-)

diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index 4537508..cab32d1 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -482,7 +482,6 @@ ifdef HAVE_ANDROID
 # Set it to "" right away to short-circuit this behaviour
 	echo "set(CMAKE_CXX_SYSROOT_FLAG \"\")" >> $@
 	echo "set(CMAKE_C_SYSROOT_FLAG \"\")" >> $@
-	echo "set(CMAKE_SYSTEM_NAME Android)" >> $@
 endif
 endif
 	echo "set(CMAKE_C_COMPILER $(CC))" >> $@



More information about the vlc-commits mailing list