[vlc-commits] Revert "contrib: toolchain.cmake: enforce variables for android"

[Thomas Guillem]

vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Wed Jan 22 10:16:21 2020 +0100| [a24e797829cafb20f5f25ddd75998119949c519d] | committer: Thomas Guillem

Revert "contrib: toolchain.cmake: enforce variables for android"

cf. https://developer.android.com/ndk/guides/cmake

"Warning: CMake has its own built-in NDK support. This workflow is not
supported by Android and is often broken with new NDK releases or when using
older versions of CMake".

This fixes cmake build using NDK21.

This reverts commit d1a978c32468cc5d07730e165593b4ed90530cd7.

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

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

diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index 5e5846de97..275188ee18 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -553,9 +553,6 @@ endif
 ifdef HAVE_DARWIN_OS
 CMAKE_SYSTEM_NAME = Darwin
 endif
-ifdef HAVE_ANDROID
-CMAKE_SYSTEM_NAME = Android
-endif
 
 ifdef HAVE_ANDROID
 CFLAGS += -DANDROID_NATIVE_API_LEVEL=$(ANDROID_API)
@@ -569,30 +566,7 @@ ifndef WITH_OPTIMIZATION
 else
 	echo "set(CMAKE_BUILD_TYPE Release)" >> $@
 endif
-
-ifdef HAVE_ANDROID
-# Android has special rules for detecting the architecture
-# and CMAKE_SYSTEM_PROCESSOR should match them.
-	echo "set(CMAKE_SYSTEM_VERSION ${ANDROID_API})" >> $@
-	echo "set(CMAKE_ANDROID_ARCH_ABI ${ANDROID_ABI})" >> $@
-
-# From CMake manual:
-# When Cross Compiling for Android and CMAKE_ANDROID_ARCH_ABI is set to
-# armeabi-v7a set CMAKE_ANDROID_ARM_NEON to ON to target ARM NEON devices.
-ifeq ($(ANDROID_ABI),armeabi-v7a)
-ifdef HAVE_NEON
-	echo "set(CMAKE_ANDROID_ARM_NEON ON)" >> $@
-else
-	echo "set(CMAKE_ANDROID_ARM_NEON OFF)" >> $@
-endif
-endif
-
-# Else use the default expected behaviour for other platforms
-else
 	echo "set(CMAKE_SYSTEM_PROCESSOR $(ARCH))" >> $@
-endif
-
-
 	if test -n "$(CMAKE_SYSTEM_NAME)"; then \
 		echo "set(CMAKE_SYSTEM_NAME $(CMAKE_SYSTEM_NAME))" >> $@; \
 	fi;