Move native code for Fontconfig instrumented tests into libpdf2htmlEX.so

Author: ViliusSutkus89

pdf2htmlEX/build.gradle

@@ -45,9 +45,6 @@ android {
     buildTypes.release.externalNativeBuild {
       cmake.arguments '-DCMAKE_BUILD_TYPE=MinSizeRel'
     }
-    packagingOptions {
-        exclude 'lib/*/libnativeFontconfigInstrumentedTests.so'
-    }
     externalNativeBuild.cmake {
         path "src/main/cpp/CMakeLists.txt"
         version "3.10.2"

pdf2htmlEX/src/androidTest/java/com/viliussutkus89/android/pdf2htmlex/FontconfigInstrumentedTests.java

@@ -34,10 +34,6 @@
 
 @RunWith(AndroidJUnit4.class)
 public class FontconfigInstrumentedTests {
-    static {
-        System.loadLibrary("nativeFontconfigInstrumentedTests");
-    }
-
     //pdf base14 fonts:
     //Courier, Courier Bold, Courier Oblique, Courier Bold-Oblique
     //Helvetica, Helvetica Bold, Helvetica Oblique, Helvetica Bold-Oblique
@@ -114,5 +110,5 @@ public synchronized void matchDingbatsTest() {
         assertEquals("d050000l.pfb", getFontFilenameFromFontconfig("Zapf Dingbats"));
     }
 
-    private native String getFontFilenameFromFontconfig(String pattern);
+    public static native String getFontFilenameFromFontconfig(String pattern);
 }

pdf2htmlEX/src/main/cpp/CMakeLists.txt

@@ -30,7 +30,8 @@ pkg_search_module(pdf2htmlEX REQUIRED pdf2htmlEX)
 
 link_directories(${pdf2htmlEX_LIBRARY_DIRS})
 
-add_library(pdf2htmlEX-android SHARED pdf2htmlEX.cc)
+add_library(pdf2htmlEX-android SHARED pdf2htmlEX.cc
+  FontconfigAndroid.cc)
 
 target_link_libraries(pdf2htmlEX-android
   ${CMAKE_CURRENT_LIST_DIR}/../../../build/tmpfile/jni/${ANDROID_ABI}/libtmpfile.so
@@ -40,8 +41,3 @@ target_link_libraries(pdf2htmlEX-android
 set_target_properties(pdf2htmlEX-android PROPERTIES COMPILE_FLAGS ${pdf2htmlEX_CFLAGS})
 target_include_directories(pdf2htmlEX-android PRIVATE ${pdf2htmlEX_INCLUDE_DIRS})
 
-add_library(nativeFontconfigInstrumentedTests SHARED nativeFontconfigInstrumentedTests.cpp)
-target_link_libraries(nativeFontconfigInstrumentedTests ${pdf2htmlEX_LIBRARIES})
-
-set_target_properties(nativeFontconfigInstrumentedTests PROPERTIES COMPILE_FLAGS ${pdf2htmlEX_CFLAGS})
-target_include_directories(nativeFontconfigInstrumentedTests PRIVATE ${pdf2htmlEX_INCLUDE_DIRS})

…pp/nativeFontconfigInstrumentedTests.cpp …htmlEX/src/main/cpp/FontconfigAndroid.ccpdf2htmlEX/src/main/cpp/nativeFontconfigInstrumentedTests.cpp renamed to pdf2htmlEX/src/main/cpp/FontconfigAndroid.cc pdf2htmlEX/src/main/cpp/nativeFontconfigInstrumentedTests.cpp renamed to pdf2htmlEX/src/main/cpp/FontconfigAndroid.cc

@@ -4,7 +4,7 @@
 extern "C"
 JNIEXPORT jstring JNICALL
 Java_com_viliussutkus89_android_pdf2htmlex_FontconfigInstrumentedTests_getFontFilenameFromFontconfig(
-        JNIEnv *env, jobject, jstring pattern_) {
+        JNIEnv *env, jclass, jstring pattern_) {
   const char * pattern = env->GetStringUTFChars(pattern_, nullptr);
   FcFontSet	*fs = FcFontSetCreate();
   FcPattern *pat = FcNameParse (reinterpret_cast<const FcChar8 *>(pattern));
@@ -36,3 +36,4 @@ Java_com_viliussutkus89_android_pdf2htmlex_FontconfigInstrumentedTests_getFontFi
   FcFini ();
   return matchedFilename ? matchedFilename : env->NewStringUTF("");
 }
+