Fix Android build with AMRWB, OpenH264 and vcard when using NDK 11.

builders/voamrwbenc/CMakeLists.txt

@@ -122,7 +122,11 @@ if(ENABLE_ARMV5E OR ENABLE_ARMV7NEON)
 	endif()
 	get_directory_property(DIRECTORY_PROPERTY_COMPILE_OPTIONS "COMPILE_OPTIONS")
 	string(REPLACE ";" " " DIRECTORY_PROPERTY_COMPILE_OPTIONS "${DIRECTORY_PROPERTY_COMPILE_OPTIONS}")
-	set(CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> ${CMAKE_CPP_FLAGS} ${CMAKE_C_FLAGS} ${DIRECTORY_PROPERTY_COMPILE_OPTIONS} ${ARCH_OPTIONS} -o <OBJECT> -c <SOURCE>")
+	set(CMAKE_ASM_TARGET_FLAG "")
+	if(CMAKE_C_COMPILER_TARGET)
+		set(CMAKE_ASM_TARGET_FLAG "--target=${CMAKE_C_COMPILER_TARGET}")
+	endif()
+	set(CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> ${CMAKE_ASM_TARGET_FLAG} ${CMAKE_CPP_FLAGS} ${CMAKE_C_FLAGS} ${DIRECTORY_PROPERTY_COMPILE_OPTIONS} ${ARCH_OPTIONS} -o <OBJECT> -c <SOURCE>")
 	enable_language(ASM)
 endif()
 

toolchains/android/toolchain-android.cmake

@@ -101,6 +101,8 @@ if(CLANG_EXECUTABLE)
 	set(CMAKE_CXX_COMPILER_TARGET "${CLANG_TARGET}")
 	set(CMAKE_CXX_COMPILER_EXTERNAL_TOOLCHAIN "${EXTERNAL_TOOLCHAIN_PATH}/..")
 
+	set(ANDROID_TOOLCHAIN_PREFIX "${EXTERNAL_TOOLCHAIN_PATH}/${COMPILER_PREFIX}-")
+
 else()
 
 	set(GCC_VERSION "4.8")
@@ -168,3 +170,4 @@ if(GCC_LIBRARY_PATH)
 endif()
 link_libraries("${ANDROID_NDK_PATH}/sources/cxx-stl/gnu-libstdc++/${GCC_VERSION}/libs/${CMAKE_SYSTEM_PROCESSOR}/libgnustl_static.a")
 link_libraries("log")
+link_libraries("atomic")