CMake: Fix Android dependencies. Depends on "log" and pixman depends …

…on "cpufeatures"

CMakeLists.txt

@@ -487,6 +487,10 @@ if(NOT PLAYER_BUILD_EXECUTABLE AND BUILD_SHARED_LIBS)
 	set_property(TARGET ${PROJECT_NAME} PROPERTY POSITION_INDEPENDENT_CODE ON)
 endif()
 
+if(ANDROID)
+	target_link_libraries(${PROJECT_NAME} log)
+endif()
+
 if(WIN32)
 	target_sources(${PROJECT_NAME} PRIVATE
 		src/registry.cpp

builds/cmake/Modules/FindPixman.cmake

@@ -53,6 +53,13 @@ include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(Pixman
 	REQUIRED_VARS PIXMAN_LIBRARY PIXMAN_INCLUDE_DIR)
 
+if(ANDROID)
+	enable_language(C)
+	# armeabi-v7a requires this
+	add_library(cpufeatures STATIC
+		${ANDROID_NDK}/sources/android/cpufeatures/cpu-features.c)
+endif()
+
 if(PIXMAN_FOUND)
 	set(PIXMAN_INCLUDE_DIRS ${PIXMAN_INCLUDE_DIR})
 
@@ -83,6 +90,11 @@ if(PIXMAN_FOUND)
 			set_property(TARGET PIXMAN::PIXMAN APPEND PROPERTY
 				IMPORTED_LOCATION "${PIXMAN_LIBRARY}")
 		endif()
+
+		if(ANDROID)
+			set_property(TARGET PIXMAN::PIXMAN APPEND PROPERTY
+				INTERFACE_LINK_LIBRARIES cpufeatures)
+		endif()
 	endif()
 endif()