diff --git a/delegate/CMakeLists.txt b/delegate/CMakeLists.txt
index 523214b..01dde4e 100644
--- a/delegate/CMakeLists.txt
+++ b/delegate/CMakeLists.txt
@@ -54,7 +54,7 @@
         src/Unpack.hpp
         src/Transpose.hpp)
 
-add_library(armnnDelegate SHARED ${armnnDelegate_sources})
+add_library(armnnDelegate ${armnnDelegate_sources})
 
 target_include_directories(armnnDelegate
         PUBLIC
@@ -254,6 +254,12 @@
 
 endif()
 
+option(BUILD_DELEGATE_JNI_INTERFACE "Builds a library to allow accessing the Arm NN delegate from Java code.
+                                     This is an experimental feature." Off)
+if(BUILD_DELEGATE_JNI_INTERFACE)
+    add_subdirectory(armnnDelegateJNI)
+endif()
+
 ####################################################
 ## Export targets
 set(armnn_delegate_export_targets)