Merge pull request #5159 from modocache/cmake-set-target-prefix-android

[CMake] Explicitly set Android lib prefix/suffix

Author: modocache

cmake/modules/AddSwift.cmake

@@ -53,7 +53,15 @@ function(_set_target_prefix_and_suffix target kind sdk)
   precondition(kind MESSAGE "kind is required")
   precondition(sdk MESSAGE "sdk is required")
 
-  if("${sdk}" STREQUAL "WINDOWS")
+  if("${sdk}" STREQUAL "ANDROID")
+    if("${kind}" STREQUAL "STATIC")
+      set_property(TARGET "${target}" PROPERTY PREFIX "lib")
+      set_property(TARGET "${target}" PROPERTY SUFFIX ".a")
+    elseif("${libkind}" STREQUAL "SHARED")
+      set_property(TARGET "${target}" PROPERTY PREFIX "lib")
+      set_property(TARGET "${target}" PROPERTY SUFFIX ".so")
+    endif()
+  elseif("${sdk}" STREQUAL "WINDOWS")
     if("${kind}" STREQUAL "STATIC")
       set_property(TARGET "${target}" PROPERTY PREFIX "lib")
       set_property(TARGET "${target}" PROPERTY SUFFIX ".lib")