Remove old android project. Add android-libpdf2htmlex (android-3rdparty will be generated on -libpdf2htmlex) and android-sample-app

Author: ViliusSutkus89

android/.gitignore renamed to android-libpdf2htmlex/.gitignore

@@ -0,0 +1,33 @@
+apply plugin: 'com.android.application'
+
+android {
+    compileSdkVersion 29
+    defaultConfig {
+        minSdkVersion 16
+        targetSdkVersion 29
+    }
+    buildTypes {
+        release {
+            externalNativeBuild {
+                cmake {
+                  arguments '-DCMAKE_BUILD_TYPE=MinSizeRel', '-DBUILD_3RDPARTY_BINARIES=OFF'
+                }
+            }
+        }
+        debug {
+            externalNativeBuild {
+                cmake {
+                  arguments '-DBUILD_3RDPARTY_BINARIES=OFF'
+                }
+            }
+        }
+    }
+    externalNativeBuild {
+        cmake {
+            path "../../CMakeLists.txt"
+            buildStagingDirectory "../../build/libpdf2htmlex/"
+            version "3.10.2"
+        }
+    }
+}
+

android/app/.gitignore renamed to android-libpdf2htmlex/app/.gitignore

@@ -10,4 +10,4 @@
         android:supportsRtl="true">
     </application>
 
-</manifest>
+</manifest>

android-libpdf2htmlex/app/build.gradle

@@ -12,4 +12,5 @@ org.gradle.jvmargs=-Xmx1536m
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 
+buildDir=../../build/gradle_libpdf2htmlex
 

android/app/src/main/AndroidManifest.xml renamed to android-libpdf2htmlex/app/src/main/AndroidManifest.xml

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.1-all.zip

android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml renamed to android-libpdf2htmlex/app/src/main/res/drawable-v24/ic_launcher_foreground.xml

@@ -0,0 +1,13 @@
+*.iml
+.gradle
+/local.properties
+/.idea/caches
+/.idea/libraries
+/.idea/modules.xml
+/.idea/workspace.xml
+/.idea/navEditor.xml
+/.idea/assetWizardSettings.xml
+.DS_Store
+/build
+/captures
+.externalNativeBuild

android/app/src/main/res/drawable/ic_launcher_background.xml renamed to android-libpdf2htmlex/app/src/main/res/drawable/ic_launcher_background.xml

@@ -0,0 +1 @@
+/build

android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml renamed to android-libpdf2htmlex/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -0,0 +1,38 @@
+apply plugin: 'com.android.application'
+
+android {
+    compileSdkVersion 29
+    buildToolsVersion "29.0.2"
+    defaultConfig {
+        applicationId "com.viliussutkus89.pdf2htmlex.android_sample_app"
+        minSdkVersion 16
+        targetSdkVersion 29
+        versionCode 1
+        versionName "1.0"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+    externalNativeBuild {
+        cmake {
+            path "src/main/cpp/CMakeLists.txt"
+            version "3.10.2"
+        }
+    }
+}
+
+dependencies {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation 'androidx.appcompat:appcompat:1.0.2'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    testImplementation 'junit:junit:4.12'
+    androidTestImplementation 'androidx.test:runner:1.2.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+}
+

android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml renamed to android-libpdf2htmlex/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -0,0 +1,27 @@
+package com.viliussutkus89.pdf2htmlex.android_sample_app;
+
+import android.content.Context;
+
+import androidx.test.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.*;
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+@RunWith(AndroidJUnit4.class)
+public class ExampleInstrumentedTest {
+    @Test
+    public void useAppContext() {
+        // Context of the app under test.
+        Context appContext = InstrumentationRegistry.getTargetContext();
+
+        assertEquals("com.viliussutkus89.pdf2htmlex.android_sample_app", appContext.getPackageName());
+    }
+}

android/app/src/main/res/mipmap-hdpi/ic_launcher.png renamed to android-libpdf2htmlex/app/src/main/res/mipmap-hdpi/ic_launcher.png

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.viliussutkus89.pdf2htmlex.android_sample_app">
+    <application
+        android:allowBackup="true"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:roundIcon="@mipmap/ic_launcher_round"
+        android:supportsRtl="true"
+        android:theme="@style/AppTheme">
+        <activity android:name=".MainActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        <provider
+            android:name="androidx.core.content.FileProvider"
+            android:authorities="${applicationId}.provider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/provider_paths"/>
+        </provider>
+    </application>
+</manifest>

android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png renamed to android-libpdf2htmlex/app/src/main/res/mipmap-hdpi/ic_launcher_round.png

@@ -0,0 +1,51 @@
+# For more information about using CMake with Android Studio, read the
+# documentation: https://d.android.com/studio/projects/add-native-code.html
+
+# Sets the minimum version of CMake required to build the native library.
+
+cmake_minimum_required(VERSION 3.4.1)
+
+# Creates and names a library, sets it as either STATIC
+# or SHARED, and provides the relative paths to its source code.
+# You can define multiple libraries, and CMake builds them for you.
+# Gradle automatically packages shared libraries with your APK.
+
+add_library( # Sets the name of the library.
+        native-lib
+
+        # Sets the library as a shared library.
+        SHARED
+
+        # Provides a relative path to your source file(s).
+        native-lib.cpp)
+
+# Searches for a specified prebuilt library and stores the path as a
+# variable. Because CMake includes system libraries in the search path by
+# default, you only need to specify the name of the public NDK library
+# you want to add. CMake verifies that the library exists before
+# completing its build.
+
+find_library( # Sets the name of the path variable.
+        log-lib
+
+        # Specifies the name of the NDK library that
+        # you want CMake to locate.
+        log)
+
+# Specifies libraries CMake should link to your target library. You
+# can link multiple libraries, such as libraries you define in this
+# build script, prebuilt third-party libraries, or system libraries.
+
+target_link_libraries( # Specifies the target library.
+        native-lib
+
+        # Links the target library to the log library
+        # included in the NDK.
+        ${log-lib}
+)
+
+
+##### HOWTO INCLUDE libpdf2htmlEX.so ########
+include(${CMAKE_SOURCE_DIR}/../jniLibs/pdf2htmlEX.cmake)
+target_link_libraries(native-lib pdf2htmlEX)
+

android/app/src/main/res/mipmap-mdpi/ic_launcher.png renamed to android-libpdf2htmlex/app/src/main/res/mipmap-mdpi/ic_launcher.png

@@ -0,0 +1,65 @@
+#include <jni.h>
+#include <string>
+#include <vector>
+#include "pdf2htmlEX.h"
+
+// Creating char ** by hand is rather annoying.
+// I'll rather take vector<string> and convert it before calling.
+void vector_to_char_pp(const std::vector<const std::string> & input, int * argc, char *** argv) {
+  *argv = nullptr;
+  *argc = 0;
+
+  size_t sz = input.size();
+  if (sz == 0) {
+    return;
+  }
+  char ** output = new char *[sz];
+  int i = 0;
+  for (const std::string & s: input) {
+    size_t len = s.length();
+    output[i] = new char[len+1];
+    output[i][len] = '\0';
+    strncpy(output[i], s.c_str(), len);
+    i++;
+  }
+
+  *argc = static_cast<int>(sz);
+  *argv = output;
+}
+
+extern "C"
+JNIEXPORT jint JNICALL
+Java_com_viliussutkus89_pdf2htmlex_android_1sample_1app_MainActivity_call_1pdf2htmlEX(JNIEnv *env,
+                                                                                      jobject instance,
+                                                                                      jstring dataDir_,
+                                                                                      jstring tmpDir_,
+                                                                                      jstring inputFile_,
+                                                                                      jstring outputFile_) {
+    const char *dataDir = env->GetStringUTFChars(dataDir_, 0);
+    const char *tmpDir = env->GetStringUTFChars(tmpDir_, 0);
+    const char *inputFile = env->GetStringUTFChars(inputFile_, 0);
+    const char *outputFile = env->GetStringUTFChars(outputFile_, 0);
+
+
+    std::vector<const std::string> args = {
+        "libpdf2htmlEX.so",
+        "--data-dir", dataDir,
+        "--tmp-dir", tmpDir,
+        inputFile, outputFile
+    };
+
+    int argc;
+    char ** argv;
+    vector_to_char_pp(args, &argc, &argv);
+    int retVal = pdf2htmlEX_main(argc, argv);
+    for (int i = 0; i < argc; i++) {
+        delete[] argv[i];
+    }
+    delete argv;
+
+    env->ReleaseStringUTFChars(dataDir_, dataDir);
+    env->ReleaseStringUTFChars(tmpDir_, tmpDir);
+    env->ReleaseStringUTFChars(inputFile_, inputFile);
+    env->ReleaseStringUTFChars(outputFile_, outputFile);
+    return retVal;
+}