fixups

Author: hyp

cmake/caches/Windows-x86_64.cmake

@@ -47,7 +47,15 @@ foreach(target ${LLVM_RUNTIME_TARGETS})
     set(RUNTIMES_${target}_CMAKE_SYSTEM_NAME Windows CACHE STRING "")
   elseif(${target} MATCHES linux-android)
     set(RUNTIMES_${target}_CMAKE_SYSTEM_NAME Android CACHE STRING "")
+    if(${target} MATCHES aarch64)
+      set(RUNTIMES_${target}_CMAKE_ANDROID_ARCH_ABI arm64-v8a CACHE STRING "")
+    else()
+      set(RUNTIMES_${target}_CMAKE_ANDROID_ARCH_ABI x86_64 CACHE STRING "")
+    endif()
     set(RUNTIMES_${target}_CMAKE_ANDROID_NDK $ENV{NDKPATH} CACHE PATH "")
+    set(RUNTIMES_${target}_CMAKE_ANDROID_API 21 CACHE STRING "")
+    set(RUNTIMES_${target}_CMAKE_C_COMPILER_TARGET "${target}21" CACHE STRING "")
+    set(RUNTIMES_${target}_CMAKE_CXX_COMPILER_TARGET "${target}21" CACHE STRING "")
   endif()
   set(RUNTIMES_${target}_CMAKE_BUILD_TYPE Release CACHE STRING "")
   set(RUNTIMES_${target}_COMPILER_RT_BUILD_BUILTINS YES CACHE BOOL "")