Link with static LiteCore instead of shared (#453)

* Link with static LiteCore instead of shared

* No longer need to call loadLibrary on LiteCore

Author: borrrden

common/CMakeLists.txt

@@ -53,9 +53,9 @@ else()
     set(BUILD_ROOT "${PROJECT_SOURCE_DIR}/../../ce/android")
 endif()
 
-add_library( LiteCore SHARED IMPORTED )
+add_library( LiteCore STATIC IMPORTED )
 set_property( TARGET LiteCore PROPERTY
-    IMPORTED_LOCATION "${PROJECT_SOURCE_DIR}/../lite-core/android/${ANDROID_ABI}/lib/libLiteCore.so"
+    IMPORTED_LOCATION "${PROJECT_SOURCE_DIR}/../lite-core/android/${ANDROID_ABI}/lib/libLiteCoreFull.a"
 )
 
 add_library( LiteCoreJNI SHARED
@@ -85,9 +85,10 @@ target_include_directories( LiteCoreJNI PUBLIC
     "${PROJECT_SOURCE_DIR}/../lite-core/android/${ANDROID_ABI}/include"
 )
 
-set_target_properties(
-    LiteCoreJNI PROPERTIES LINK_FLAGS
-    "-Wl,-z,max-page-size=16384,--version-script=${BUILD_ROOT}/etc/ld/jni_android.ld"
+target_link_options(
+    LiteCoreJNI PRIVATE
+    -Wl,-z,max-page-size=16384,--version-script=${BUILD_ROOT}/etc/ld/jni_android.ld
+    -Wl,--undefined-version
 )
 
 target_link_libraries( LiteCoreJNI

java/main/java/com/couchbase/lite/internal/NativeLibrary.java

@@ -57,7 +57,6 @@ private NativeLibrary() { }
     private static final String ARCH_UNIVERSAL = "universal";
 
     private static final String LIB_JNI = "LiteCoreJNI";
-    private static final String LIB_LITE_CORE = "LiteCore";
 
     private static final String WINDOWS_OS_DIR = "windows";
     private static final String LINUX_OS_DIR = "linux";
@@ -84,8 +83,6 @@ static void load(@NonNull File scratchDir) {
         final String os = System.getProperty("os.name");
         final String arch = System.getProperty("os.arch");
 
-        loadLibrary(LIB_LITE_CORE, getCoreArchDir(os, arch), os, arch, scratchDir);
-
         loadLibrary(LIB_JNI, getJniArchDir(os, arch), os, arch, scratchDir);
     }