[vlc-commits] [Git][videolan/vlc][master] 2 commits: contrib: include the Android CMake toolchain file

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
b2ae29b4 by Steve Lhomme at 2025-02-04T16:32:55+00:00
contrib: include the Android CMake toolchain file

We're supposed to use it with the Android SYSTEM_NAME
* https://developer.android.com/studio/projects/configure-cmake
* https://developer.android.com/ndk/guides/cmake

We could do the same for Emscripten, rather than using their cmake wrapper.

- - - - -
96c80ec7 by Steve Lhomme at 2025-02-04T16:32:55+00:00
contrib: don't force the ANDROID variable

It should be done by the NDK toolchain or by CMake when using the proper CMAKE_SYSTEM_NAME.

- - - - -


2 changed files:

- contrib/src/gen-cmake-toolchain.py
- contrib/src/main.mak


Changes:

=====================================
contrib/src/gen-cmake-toolchain.py
=====================================
@@ -44,9 +44,9 @@ _add_environ_val('CMAKE_OSX_SYSROOT', 'OSX_SYSROOT')
 _add_environ_val('CMAKE_C_COMPILER', 'CC')
 _add_environ_val('CMAKE_CXX_COMPILER', 'CXX')
 
-_add_environ_val('CMAKE_ANDROID_NDK', 'ANDROID_NDK')
-_add_environ_val('CMAKE_ANDROID_ARCH_ABI', 'ANDROID_ABI')
-_add_environ_val('CMAKE_ANDROID_API', 'ANDROID_API')
+_add_environ_val('ANDROID_NDK', 'ANDROID_NDK')
+_add_environ_val('ANDROID_ABI', 'ANDROID_ABI')
+_add_environ_val('ANDROID_PLATFORM', 'ANDROID_API')
 
 _add_environ_val('PKG_CONFIG_EXECUTABLE', 'PKG_CONFIG')
 


=====================================
contrib/src/main.mak
=====================================
@@ -506,9 +506,6 @@ endif
 ifdef HAVE_WIN32
 CMAKE += -DCMAKE_DEBUG_POSTFIX:STRING=
 endif
-ifdef HAVE_ANDROID
-CMAKE += -DANDROID:BOOL=ON
-endif
 ifdef MSYS_BUILD
 CMAKE = PKG_CONFIG_LIBDIR="$(PKG_CONFIG_PATH)" $(CMAKE)
 CMAKE += -DCMAKE_LINK_LIBRARY_SUFFIX:STRING=.a
@@ -765,6 +762,7 @@ ifdef HAVE_ANDROID
 	CMAKE_TOOLCHAIN_ENV += ANDROID_NDK=$(ANDROID_NDK)
 	CMAKE_TOOLCHAIN_ENV += ANDROID_ABI=$(ANDROID_ABI)
 	CMAKE_TOOLCHAIN_ENV += ANDROID_API=$(ANDROID_API)
+	CMAKE_TOOLCHAIN_ENV += EXTRA_INCLUDE=$(ANDROID_NDK)/build/cmake/android.toolchain.cmake
 endif
 ifdef MSYS_BUILD
 	CMAKE_TOOLCHAIN_ENV += FIND_ROOT_PATH="$(shell cygpath -m $(PREFIX))"



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/aae25bb60d7647c36ec91ebf18127bb364abf7ae...96c80ec7803bdfb95c084f3f837a5dc645d444f4

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/aae25bb60d7647c36ec91ebf18127bb364abf7ae...96c80ec7803bdfb95c084f3f837a5dc645d444f4
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance