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))"