Add Vulkan executor runner to Android JNIs (#2563)

Summary:
Pull Request resolved: #2563

imported-using-ghimport

Test Plan: Imported from OSS

Reviewed By: kirklandsign

Differential Revision: D55198671

Pulled By: SS-JIA

fbshipit-source-id: db77d7952a40b71047c6df23545fd86eff90de2b

Author: SS-JIA

backends/vulkan/CMakeLists.txt

@@ -116,8 +116,9 @@ if(NOT CMAKE_TOOLCHAIN_FILE MATCHES ".*iOS\.cmake$")
   target_compile_options(vulkan_executor_runner PUBLIC ${VULKAN_CXX_FLAGS})
 
   add_library(vulkan_executor_runner_lib STATIC ${VULKAN_RUNNER_SRCS})
-  target_link_libraries(vulkan_executor_runner_lib ${_executor_runner_libs}
-                        vulkan_schema vulkan_backend)
+  target_link_libraries(
+    vulkan_executor_runner_lib ${_executor_runner_libs} vulkan_schema
+    vulkan_backend vulkan_api_lib ${VULKAN_STANDARD_OPS_LIBS})
   target_compile_options(vulkan_executor_runner_lib PUBLIC ${VULKAN_CXX_FLAGS})
 endif()
 

extension/android/CMakeLists.txt

@@ -4,7 +4,6 @@
 # This source code is licensed under the BSD-style license found in the
 # LICENSE file in the root directory of this source tree.
 
-
 cmake_minimum_required(VERSION 3.19)
 
 project(executorch_jni)
@@ -14,22 +13,32 @@ include(${EXECUTORCH_ROOT}/build/Utils.cmake)
 
 set(_common_include_directories ${EXECUTORCH_ROOT}/..)
 
-add_subdirectory(
-        ${EXECUTORCH_ROOT}/examples/third-party/fbjni
-        ${CMAKE_CURRENT_BINARY_DIR}/third-party/fbjni)
+add_subdirectory(${EXECUTORCH_ROOT}/examples/third-party/fbjni
+                 ${CMAKE_CURRENT_BINARY_DIR}/third-party/fbjni)
 
 if(CMAKE_TOOLCHAIN_ANDROID)
-    add_library(executorch_jni SHARED jni/jni_layer.cpp)
-    target_link_libraries(executorch_jni extension_data_loader
-        extension_module xnn_executor_runner_lib fbjni)
-    if(EXECUTORCH_BUILD_QNN)
-        target_link_libraries(executorch_jni qnn_executorch_backend)
-    endif()
-    target_compile_options(executorch_jni PUBLIC ${_common_compile_options})
-
-    add_library(executorch_llama_jni SHARED jni/jni_layer_llama.cpp)
-    target_link_libraries(executorch_llama_jni fbjni llama_runner
-                          xnn_executor_runner_lib)
-    target_compile_options(executorch_llama_jni PUBLIC
-                           ${_common_compile_options})
+  add_library(executorch_jni SHARED jni/jni_layer.cpp)
+  target_link_libraries(executorch_jni extension_data_loader extension_module
+                        fbjni)
+  if(EXECUTORCH_BUILD_QNN)
+    target_link_libraries(executorch_jni qnn_executorch_backend)
+  endif()
+  if(EXECUTORCH_BUILD_XNNPACK)
+    target_link_libraries(executorch_jni xnn_executor_runner_lib)
+  endif()
+  if(EXECUTORCH_BUILD_VULKAN)
+    target_link_libraries(executorch_jni vulkan_executor_runner_lib)
+  endif()
+  target_compile_options(executorch_jni PUBLIC ${_common_compile_options})
+
+  add_library(executorch_llama_jni SHARED jni/jni_layer_llama.cpp)
+  target_link_libraries(executorch_llama_jni fbjni llama_runner)
+  if(EXECUTORCH_BUILD_XNNPACK)
+    target_link_libraries(executorch_llama_jni xnn_executor_runner_lib)
+  endif()
+  if(EXECUTORCH_BUILD_VULKAN)
+    target_link_libraries(executorch_llama_jni vulkan_executor_runner_lib)
+  endif()
+
+  target_compile_options(executorch_llama_jni PUBLIC ${_common_compile_options})
 endif()