Remove the JNI and adjust the readme (#1258)

* Remove the JNI and adjust the readme

* Options->Option

Author: sirknightj

.github/workflows/ci.yml

@@ -117,7 +117,7 @@ jobs:
       - name: Build repository
         run: |
           mkdir build && cd build
-          cmake .. -DCODE_COVERAGE=TRUE -DBUILD_TEST=TRUE -DBUILD_GSTREAMER_PLUGIN=TRUE -DBUILD_JNI=TRUE -DCMAKE_INSTALL_PREFIX=.
+          cmake .. -DCODE_COVERAGE=TRUE -DBUILD_TEST=TRUE -DBUILD_GSTREAMER_PLUGIN=TRUE -DCMAKE_INSTALL_PREFIX=.
           make
           make install
       - name: Configure AWS Credentials
@@ -135,7 +135,7 @@ jobs:
       - name: Code coverage
         run: |
           cd build
-          for test_file in $(find CMakeFiles/KinesisVideoProducer.dir gstkvssink.dir KinesisVideoProducerJNI.dir -name '*.gcno'); do gcov $test_file; done
+          for test_file in $(find CMakeFiles/KinesisVideoProducer.dir gstkvssink.dir -name '*.gcno'); do gcov $test_file; done
           bash <(curl -s https://codecov.io/bash)
 
   address-sanitizer:
@@ -158,7 +158,7 @@ jobs:
       - name: Build repository
         run: |
           mkdir build && cd build
-          cmake .. -DBUILD_TEST=TRUE -DADDRESS_SANITIZER=TRUE -DBUILD_GSTREAMER_PLUGIN=TRUE -DBUILD_JNI=TRUE -DCMAKE_INSTALL_PREFIX=.
+          cmake .. -DBUILD_TEST=TRUE -DADDRESS_SANITIZER=TRUE -DBUILD_GSTREAMER_PLUGIN=TRUE -DCMAKE_INSTALL_PREFIX=.
           make
           make install
       - name: Configure AWS Credentials
@@ -194,7 +194,7 @@ jobs:
       - name: Build repository
         run: |
           mkdir build && cd build
-          cmake .. -DBUILD_TEST=TRUE -DUNDEFINED_BEHAVIOR_SANITIZER=TRUE -DBUILD_GSTREAMER_PLUGIN=TRUE -DBUILD_JNI=TRUE -DCMAKE_INSTALL_PREFIX=.
+          cmake .. -DBUILD_TEST=TRUE -DUNDEFINED_BEHAVIOR_SANITIZER=TRUE -DBUILD_GSTREAMER_PLUGIN=TRUE -DCMAKE_INSTALL_PREFIX=.
           make
           make install
       - name: Configure AWS Credentials
@@ -257,7 +257,7 @@ jobs:
   #       run: |
   #         sudo apt-get install -y libssl-dev libcurl4-openssl-dev liblog4cplus-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev gstreamer1.0-plugins-base-apps gstreamer1.0-plugins-bad gstreamer1.0-plugins-good gstreamer1.0-plugins-ugly gstreamer1.0-tools
   #         mkdir build && cd build
-  #         cmake .. -DBUILD_TEST=TRUE -DTHREAD_SANITIZER=TRUE -DBUILD_GSTREAMER_PLUGIN=TRUE -DBUILD_JNI=TRUE
+  #         cmake .. -DBUILD_TEST=TRUE -DTHREAD_SANITIZER=TRUE -DBUILD_GSTREAMER_PLUGIN=TRUE
   #         make
   #         ulimit -c unlimited -S
   #         timeout --signal=SIGABRT 20m ./tst/producerTest
@@ -291,7 +291,7 @@ jobs:
       - name: Build repository
         run: |
           mkdir build && cd build
-          cmake .. -DBUILD_TEST=TRUE -DBUILD_GSTREAMER_PLUGIN=TRUE -DBUILD_JNI=TRUE -DCMAKE_INSTALL_PREFIX=. -DPARALLEL_BUILD=${{ matrix.parallel-build }}
+          cmake .. -DBUILD_TEST=TRUE -DBUILD_GSTREAMER_PLUGIN=TRUE -DCMAKE_INSTALL_PREFIX=. -DPARALLEL_BUILD=${{ matrix.parallel-build }}
           
           if [[ "${{ matrix.parallel-build }}" == 'ON' ]]; then
             make -j install

.github/workflows/jni.yml

@@ -10,8 +10,6 @@ include(GNUInstallDirs)
 
 # User Flags
 option(BUILD_GSTREAMER_PLUGIN "Build kvssink GStreamer plugin" OFF)
-option(BUILD_JNI "Build C++ wrapper for JNI to expose the functionality to Java/Android" OFF)
-option(BUILD_JNI_ONLY "Build ONLY the JNI, don't build C++ Producer SDK" OFF)
 option(BUILD_STATIC "Build with static linkage" OFF)
 option(ADD_MUCLIBC "Add -muclibc c flag" OFF)
 option(BUILD_DEPENDENCIES "Whether or not to build depending libraries from source" ON)
@@ -58,81 +56,79 @@ add_definitions(-DKVS_CA_CERT_PATH="${CMAKE_CURRENT_SOURCE_DIR}/certs/cert.pem")
 add_definitions(-DCMAKE_DETECTED_CACERT_PATH)
 
 
-if(NOT BUILD_JNI_ONLY)
-  if(BUILD_DEPENDENCIES)
-    if(NOT EXISTS ${KINESIS_VIDEO_OPEN_SOURCE_SRC})
-      file(MAKE_DIRECTORY ${KINESIS_VIDEO_OPEN_SOURCE_SRC}/local)
-    endif()
-
-    if (NOT OPEN_SRC_INSTALL_PREFIX)
-      set(OPEN_SRC_INSTALL_PREFIX ${KINESIS_VIDEO_OPEN_SOURCE_SRC}/local)
-      set(ENV{PKG_CONFIG_PATH}
-            "$ENV{PKG_CONFIG_PATH}:${OPEN_SRC_INSTALL_PREFIX}/lib/pkgconfig")
-      set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} ${OPEN_SRC_INSTALL_PREFIX})
-      set(ENV{PATH} "$ENV{PATH}:${OPEN_SRC_INSTALL_PREFIX}/bin")
-    endif()
-
+if(BUILD_DEPENDENCIES)
+  if(NOT EXISTS ${KINESIS_VIDEO_OPEN_SOURCE_SRC})
+    file(MAKE_DIRECTORY ${KINESIS_VIDEO_OPEN_SOURCE_SRC}/local)
+  endif()
 
-    message(STATUS "Begin building dependencies.")
-    if (NOT WIN32)
-      build_dependency(autoconf)
-      build_dependency(automake)
-    endif()
+  if (NOT OPEN_SRC_INSTALL_PREFIX)
+    set(OPEN_SRC_INSTALL_PREFIX ${KINESIS_VIDEO_OPEN_SOURCE_SRC}/local)
+    set(ENV{PKG_CONFIG_PATH}
+          "$ENV{PKG_CONFIG_PATH}:${OPEN_SRC_INSTALL_PREFIX}/lib/pkgconfig")
+    set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} ${OPEN_SRC_INSTALL_PREFIX})
+    set(ENV{PATH} "$ENV{PATH}:${OPEN_SRC_INSTALL_PREFIX}/bin")
+  endif()
 
-    if(BUILD_LOG4CPLUS_HOST)
-      set(BUILD_ARGS -DBUILD_LOG4CPLUS_HOST=${BUILD_LOG4CPLUS_HOST})
-      build_dependency(log4cplus ${BUILD_ARGS} -DBUILD_STATIC=${BUILD_STATIC})
-    else()
-      build_dependency(log4cplus -DBUILD_STATIC=${BUILD_STATIC})
-    endif()
 
-    message(STATUS "Finished building dependencies.")
+  message(STATUS "Begin building dependencies.")
+  if (NOT WIN32)
+    build_dependency(autoconf)
+    build_dependency(automake)
   endif()
 
-  set(BUILD_COMMON_LWS
-      FALSE
-      CACHE BOOL "Build ProducerC without LWS Support" FORCE)
-  set(BUILD_COMMON_CURL
-      TRUE
-      CACHE BOOL "Build ProducerC with CURL Support" FORCE)
-  set(DEPENDENCY_DOWNLOAD_PATH ${CMAKE_CURRENT_SOURCE_DIR}/dependency)
-  if(NOT EXISTS ${DEPENDENCY_DOWNLOAD_PATH})
-    file(MAKE_DIRECTORY ${DEPENDENCY_DOWNLOAD_PATH})
+  if(BUILD_LOG4CPLUS_HOST)
+    set(BUILD_ARGS -DBUILD_LOG4CPLUS_HOST=${BUILD_LOG4CPLUS_HOST})
+    build_dependency(log4cplus ${BUILD_ARGS} -DBUILD_STATIC=${BUILD_STATIC})
+  else()
+    build_dependency(log4cplus -DBUILD_STATIC=${BUILD_STATIC})
   endif()
 
-  fetch_repo(kvscproducer)
-  add_subdirectory(${DEPENDENCY_DOWNLOAD_PATH}/libkvscproducer/kvscproducer-src EXCLUDE_FROM_ALL)
-  ############# find dependent libraries ############
+  message(STATUS "Finished building dependencies.")
+endif()
 
-  find_package(Threads)
-  find_package(PkgConfig REQUIRED)
+set(BUILD_COMMON_LWS
+    FALSE
+    CACHE BOOL "Build ProducerC without LWS Support" FORCE)
+set(BUILD_COMMON_CURL
+    TRUE
+    CACHE BOOL "Build ProducerC with CURL Support" FORCE)
+set(DEPENDENCY_DOWNLOAD_PATH ${CMAKE_CURRENT_SOURCE_DIR}/dependency)
+if(NOT EXISTS ${DEPENDENCY_DOWNLOAD_PATH})
+  file(MAKE_DIRECTORY ${DEPENDENCY_DOWNLOAD_PATH})
+endif()
 
-  if (OPEN_SRC_INSTALL_PREFIX)
-    find_package(CURL REQUIRED PATHS ${OPEN_SRC_INSTALL_PREFIX})
-  else()
-    find_package(CURL REQUIRED)
-  endif()
+fetch_repo(kvscproducer)
+add_subdirectory(${DEPENDENCY_DOWNLOAD_PATH}/libkvscproducer/kvscproducer-src EXCLUDE_FROM_ALL)
+############# find dependent libraries ############
 
-  set(OPEN_SRC_INCLUDE_DIRS ${OPEN_SRC_INCLUDE_DIRS} ${CURL_INCLUDE_DIRS})
-  link_directories(${CURL_LIBRARY_DIRS})
+find_package(Threads)
+find_package(PkgConfig REQUIRED)
 
-  if (WIN32)
-    find_package(Log4cplus
-      NAMES log4cplus REQUIRED
-      PATHS ${OPEN_SRC_INSTALL_PREFIX}/lib)
-    SET(Log4cplus "log4cplus::log4cplus")
-  else()
-    find_package(Log4cplus REQUIRED)
-    include_directories(${LOG4CPLUS_INCLUDE_DIR})
-    set(Log4cplus ${LOG4CPLUS_LIBRARIES})
-  endif()
+if (OPEN_SRC_INSTALL_PREFIX)
+  find_package(CURL REQUIRED PATHS ${OPEN_SRC_INSTALL_PREFIX})
+else()
+  find_package(CURL REQUIRED)
+endif()
+
+set(OPEN_SRC_INCLUDE_DIRS ${OPEN_SRC_INCLUDE_DIRS} ${CURL_INCLUDE_DIRS})
+link_directories(${CURL_LIBRARY_DIRS})
+
+if (WIN32)
+  find_package(Log4cplus
+    NAMES log4cplus REQUIRED
+    PATHS ${OPEN_SRC_INSTALL_PREFIX}/lib)
+  SET(Log4cplus "log4cplus::log4cplus")
+else()
+  find_package(Log4cplus REQUIRED)
+  include_directories(${LOG4CPLUS_INCLUDE_DIR})
+  set(Log4cplus ${LOG4CPLUS_LIBRARIES})
+endif()
 
-  if (WIN32)
-    if(EXISTS "C:\\gstreamer\\1.0\\msvc_x86_64\\bin\\pkg-config.exe")
-      set(PKG_CONFIG_EXECUTABLE "C:\\gstreamer\\1.0\\msvc_x86_64\\bin\\pkg-config.exe")
-    else()
-      set(PKG_CONFIG_EXECUTABLE "D:\\gstreamer\\1.0\\msvc_x86_64\\bin\\pkg-config.exe")
-    endif()
+if (WIN32)
+  if(EXISTS "C:\\gstreamer\\1.0\\msvc_x86_64\\bin\\pkg-config.exe")
+    set(PKG_CONFIG_EXECUTABLE "C:\\gstreamer\\1.0\\msvc_x86_64\\bin\\pkg-config.exe")
+  else()
+    set(PKG_CONFIG_EXECUTABLE "D:\\gstreamer\\1.0\\msvc_x86_64\\bin\\pkg-config.exe")
   endif()
 endif()
 
@@ -172,7 +168,6 @@ endif()
 ############# Build Targets ############
 file(GLOB PRODUCER_CPP_SOURCE_FILES "src/*.cpp" "src/common/*.cpp" "src/credential-providers/*.cpp")
 file(GLOB GST_PLUGIN_SOURCE_FILES "src/gstreamer/*.cpp" "src/gstreamer/Util/*.cpp")
-file(GLOB_RECURSE JNI_SOURCE_FILES "src/JNI/*.cpp")
 file(GLOB PIC_HEADERS "${pic_project_SOURCE_DIR}/src/*/include")
 
 include_directories(${PIC_HEADERS})
@@ -182,44 +177,24 @@ include_directories(${KINESIS_VIDEO_OPEN_SOURCE_SRC}/include)
 include_directories(${KINESIS_VIDEO_PRODUCER_CPP_SRC}/src)
 include_directories(${KINESIS_VIDEO_PRODUCER_CPP_SRC}/src/credential-providers)
 include_directories(${KINESIS_VIDEO_PRODUCER_CPP_SRC}/src/common)
-include_directories(${KINESIS_VIDEO_PRODUCER_CPP_SRC}/src/JNI/include)
-
-if (NOT BUILD_JNI_ONLY)
-  install(
-    DIRECTORY ${KINESIS_VIDEO_PRODUCER_CPP_SRC}/src
-    DESTINATION .)
-
-  add_library(KinesisVideoProducer ${LINKAGE} ${PRODUCER_CPP_SOURCE_FILES})
-  target_link_libraries(
-    KinesisVideoProducer
-    PUBLIC kvsCommonCurl
-           cproducer
-           ${Log4cplus}
-           ${LIBCURL_LIBRARIES})
-
-  install(
-      TARGETS KinesisVideoProducer
-      ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-      LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-      RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
-endif()
-
-if (BUILD_JNI_ONLY)
-  set(DEPENDENCY_DOWNLOAD_PATH ${CMAKE_CURRENT_SOURCE_DIR}/dependency)
-  set(BUILD_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE})
-  fetch_repo(kvspic ${BUILD_ARGS})
-  add_subdirectory("${DEPENDENCY_DOWNLOAD_PATH}/libkvspic/kvspic-src")
-  file(GLOB PIC_HEADERS "${pic_project_SOURCE_DIR}/src/*/include")
-  include_directories("${PIC_HEADERS}")
-endif()
 
-if(BUILD_JNI OR BUILD_JNI_ONLY)
-  find_package(JNI REQUIRED)
-  include_directories(${JNI_INCLUDE_DIRS})
-
-  add_library(KinesisVideoProducerJNI SHARED ${JNI_HEADERS} ${JNI_SOURCE_FILES})
-  target_link_libraries(KinesisVideoProducerJNI kvspic)
-endif()
+install(
+  DIRECTORY ${KINESIS_VIDEO_PRODUCER_CPP_SRC}/src
+  DESTINATION .)
+
+add_library(KinesisVideoProducer ${LINKAGE} ${PRODUCER_CPP_SOURCE_FILES})
+target_link_libraries(
+  KinesisVideoProducer
+  PUBLIC kvsCommonCurl
+         cproducer
+         ${Log4cplus}
+         ${LIBCURL_LIBRARIES})
+
+install(
+    TARGETS KinesisVideoProducer
+    ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+    LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+    RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
 
 
 if(BUILD_GSTREAMER_PLUGIN)