pdf2htmlEX Conan

.github/config/ubuntu-22.04/conan/profiles/android-23-armv7

@@ -0,0 +1,35 @@
+{% set android_home = os.getenv("ANDROID_HOME") %}
+{% set ndk_version = "26.3.11579264" %}
+{% set api_level = "23" %}
+{% set arch = "armv7" %}
+{% set cc = {
+    "armv7": "armv7a-linux-androideabi" + api_level + "-clang",
+    "armv8": "aarch64-linux-android" + api_level + "-clang",
+    "x86": "i686-linux-android" + api_level + "-clang",
+    "x86_64": "x86_64-linux-android" + api_level + "-clang",
+}[arch] %}
+
+[settings]
+os=Android
+os.api_level={{api_level}}
+arch={{arch}}
+build_type=RelWithDebInfo
+compiler=clang
+compiler.version=17
+compiler.cppstd=20
+compiler.libcxx=c++_shared
+
+[conf]
+tools.android:ndk_path={{android_home}}/ndk/{{ndk_version}}
+
+[buildenv]
+# Cross compile toolchain evn vars are required to build
+# libffi, libgettext, libiconv, libxml2 and other autotools packages for Android
+# https://github.com/conan-io/conan/issues/16493
+AR={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar
+AS={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-as
+RANLIB={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ranlib
+CC={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/{{cc}}
+CXX={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/{{cc}}++
+LD={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/ld
+STRIP={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip

.github/config/ubuntu-22.04/conan/profiles/android-23-armv8

@@ -0,0 +1,35 @@
+{% set android_home = os.getenv("ANDROID_HOME") %}
+{% set ndk_version = "26.3.11579264" %}
+{% set api_level = "23" %}
+{% set arch = "armv8" %}
+{% set cc = {
+    "armv7": "armv7a-linux-androideabi" + api_level + "-clang",
+    "armv8": "aarch64-linux-android" + api_level + "-clang",
+    "x86": "i686-linux-android" + api_level + "-clang",
+    "x86_64": "x86_64-linux-android" + api_level + "-clang",
+}[arch] %}
+
+[settings]
+os=Android
+os.api_level={{api_level}}
+arch={{arch}}
+build_type=RelWithDebInfo
+compiler=clang
+compiler.version=17
+compiler.cppstd=20
+compiler.libcxx=c++_shared
+
+[conf]
+tools.android:ndk_path={{android_home}}/ndk/{{ndk_version}}
+
+[buildenv]
+# Cross compile toolchain evn vars are required to build
+# libffi, libgettext, libiconv, libxml2 and other autotools packages for Android
+# https://github.com/conan-io/conan/issues/16493
+AR={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar
+AS={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-as
+RANLIB={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ranlib
+CC={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/{{cc}}
+CXX={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/{{cc}}++
+LD={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/ld
+STRIP={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip

.github/config/ubuntu-22.04/conan/profiles/android-23-x86

@@ -0,0 +1,35 @@
+{% set android_home = os.getenv("ANDROID_HOME") %}
+{% set ndk_version = "26.3.11579264" %}
+{% set api_level = "23" %}
+{% set arch = "x86" %}
+{% set cc = {
+    "armv7": "armv7a-linux-androideabi" + api_level + "-clang",
+    "armv8": "aarch64-linux-android" + api_level + "-clang",
+    "x86": "i686-linux-android" + api_level + "-clang",
+    "x86_64": "x86_64-linux-android" + api_level + "-clang",
+}[arch] %}
+
+[settings]
+os=Android
+os.api_level={{api_level}}
+arch={{arch}}
+build_type=RelWithDebInfo
+compiler=clang
+compiler.version=17
+compiler.cppstd=20
+compiler.libcxx=c++_shared
+
+[conf]
+tools.android:ndk_path={{android_home}}/ndk/{{ndk_version}}
+
+[buildenv]
+# Cross compile toolchain evn vars are required to build
+# libffi, libgettext, libiconv, libxml2 and other autotools packages for Android
+# https://github.com/conan-io/conan/issues/16493
+AR={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar
+AS={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-as
+RANLIB={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ranlib
+CC={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/{{cc}}
+CXX={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/{{cc}}++
+LD={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/ld
+STRIP={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip

.github/config/ubuntu-22.04/conan/profiles/android-23-x86_64

@@ -0,0 +1,35 @@
+{% set android_home = os.getenv("ANDROID_HOME") %}
+{% set ndk_version = "26.3.11579264" %}
+{% set api_level = "23" %}
+{% set arch = "x86_64" %}
+{% set cc = {
+    "armv7": "armv7a-linux-androideabi" + api_level + "-clang",
+    "armv8": "aarch64-linux-android" + api_level + "-clang",
+    "x86": "i686-linux-android" + api_level + "-clang",
+    "x86_64": "x86_64-linux-android" + api_level + "-clang",
+}[arch] %}
+
+[settings]
+os=Android
+os.api_level={{api_level}}
+arch={{arch}}
+build_type=RelWithDebInfo
+compiler=clang
+compiler.version=17
+compiler.cppstd=20
+compiler.libcxx=c++_shared
+
+[conf]
+tools.android:ndk_path={{android_home}}/ndk/{{ndk_version}}
+
+[buildenv]
+# Cross compile toolchain evn vars are required to build
+# libffi, libgettext, libiconv, libxml2 and other autotools packages for Android
+# https://github.com/conan-io/conan/issues/16493
+AR={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar
+AS={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-as
+RANLIB={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ranlib
+CC={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/{{cc}}
+CXX={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/{{cc}}++
+LD={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/ld
+STRIP={{android_home}}/ndk/{{ndk_version}}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip

.github/config/ubuntu-22.04/conan/profiles/default

@@ -0,0 +1,11 @@
+[settings]
+os=Linux
+arch=x86_64
+build_type=Release
+compiler=gcc
+compiler.version=12
+compiler.cppstd=20
+compiler.libcxx=libstdc++11
+
+[conf]
+tools.build:compiler_executables={'c': 'gcc-12', 'cpp': 'g++-12'}

.github/config/ubuntu-22.04/conan/profiles/ubuntu

@@ -0,0 +1 @@
+default

.github/workflows/android_main.yml

@@ -43,8 +43,9 @@ jobs:
 
     - name: conan remote
       run: conan remote add odr https://artifactory.opendocument.app/artifactory/api/conan/conan
-    - name: conan profile
-      run: conan profile detect
+
+    - name: conan config
+      run: conan config install .github/config/ubuntu-22.04/conan
 
     - name: gradle
       run: ./gradlew assembleDebug lintProDebug lintLiteDebug --stacktrace

app/CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.18.1)
-project(odr-droid CXX)
+project(odr-droid LANGUAGES CXX C)
 
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
@@ -13,3 +13,6 @@ target_include_directories(odr-core
         PRIVATE src/main/cpp)
 target_link_libraries(odr-core
         PRIVATE odrcore::odrcore log)
+
+add_library(envvar SHARED src/main/cpp/EnvVar.c)
+set_target_properties(envvar PROPERTIES LINKER_LANGUAGE C)

app/build.gradle

@@ -1,5 +1,3 @@
-import org.apache.tools.ant.filters.ReplaceTokens
-
 plugins {
     id 'com.android.application'
     id 'com.google.gms.google-services'
@@ -11,16 +9,9 @@ android {
     ndkVersion "26.3.11579264"
 }
 
-tasks.register('conanProfile', Copy) {
-    from "conanprofile.txt"
-    into project.layout.buildDirectory
-    filter(ReplaceTokens, tokens: ["NDK_PATH": android.ndkDirectory.toString()])
-}
-
 ["armv8", "armv7", "x86", "x86_64"].each { architecture ->
     tasks.named("conanInstall-" + architecture) {
-        profile.set('build/conanprofile.txt')
-        dependsOn(tasks.named('conanProfile'))
+        profile.set('../.github/config/ubuntu-22.04/conan/profiles/android-23-' + architecture)
     }
 }
 
@@ -40,13 +31,16 @@ android {
 
         externalNativeBuild {
             cmake {
-                targets "odr-core"
+                targets "odr-core", "envvar"
                 arguments(
                     "-DCMAKE_TOOLCHAIN_FILE=build/conan/android_toolchain.cmake",
+                    // We can migrate to static STL once all C++ deps are in conan and linked as one .so library
+                    "-DANDROID_STL=c++_shared",
                     "-DCMAKE_BUILD_TYPE=RelWithDebInfo",
                 )
             }
         }
+        sourceSets.main.assets.srcDirs += "build/conan/armv8/assets"
     }
 
     flavorDimensions "default"
@@ -111,18 +105,25 @@ android {
     lint {
         abortOnError false
     }
-    packagingOptions {
-        jniLibs {
-            // No need to pickFirst libc++_shared.so if all files are identical.
-            // They will be identical if NDK major version matches.
-            // NDK runtime problems may occur if NDK version mismatches,
-            // so comment this out, to get a compile error instead
-            // pickFirsts += ['**/libc++_shared.so']
-        }
-    }
     namespace 'at.tomtasche.reader'
 }
 
+// Make sure the assets are installed when needed
+afterEvaluate {
+    tasks.named("generateProDebugAssets").configure {
+        dependsOn(tasks.named("conanInstall-armv8"))
+    }
+    tasks.named("generateProReleaseAssets").configure {
+        dependsOn(tasks.named("conanInstall-armv8"))
+    }
+    tasks.named("generateLiteDebugAssets").configure {
+        dependsOn(tasks.named("conanInstall-armv8"))
+    }
+    tasks.named("generateLiteReleaseAssets").configure {
+        dependsOn(tasks.named("conanInstall-armv8"))
+    }
+}
+
 dependencies {
     implementation platform('com.google.firebase:firebase-bom:33.1.1')
     implementation 'com.google.firebase:firebase-storage'
@@ -140,8 +141,8 @@ dependencies {
     implementation 'com.google.android.material:material:1.12.0'
     implementation 'androidx.webkit:webkit:1.11.0'
 
-    implementation 'app.opendocument:pdf2htmlex-android:0.18.25'
-    implementation 'com.viliussutkus89:wvware-android:1.2.9'
+    implementation 'com.viliussutkus89:fontconfig-android-translator:1.0.2'
+    implementation 'com.viliussutkus89:assetextractor-android:1.3.3'
     implementation 'com.github.huzongyao:AndroidMagic:v1.1.2'
 
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'

app/conanfile.py

@@ -0,0 +1,30 @@
+import os
+
+from conan import ConanFile
+from conan.tools.cmake import CMakeToolchain, CMakeDeps
+
+required_conan_version = ">=2.0.6"
+
+
+class OdrDroidConan(ConanFile):
+    settings = "os", "compiler", "build_type", "arch"
+
+    def requirements(self):
+        self.requires("odrcore/4.1.0-pdf2htmlex-git", options={
+            "with_pdf2htmlEX": True,
+            "with_wvWare": True,
+        })
+
+    def generate(self):
+        deps = CMakeDeps(self)
+        deps.generate()
+
+        tc = CMakeToolchain(self)
+        tc.generate()
+
+        asset_dir = os.path.join(self.build_folder, 'assets')
+        os.mkdir(asset_dir)
+        os.symlink(self.dependencies['pdf2htmlex'].cpp_info.resdirs[0], os.path.join(asset_dir, 'pdf2htmlEX'))
+        os.symlink(self.dependencies['poppler-data'].cpp_info.resdirs[0], os.path.join(asset_dir, 'poppler-data'))
+        os.symlink(self.dependencies['fontconfig'].cpp_info.resdirs[0], os.path.join(asset_dir, 'fontconfig'))
+        os.symlink(self.dependencies['wvware'].cpp_info.resdirs[0], os.path.join(asset_dir, 'wv'))

app/src/main/assets/etc/fonts/local.conf

@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+  <its:rules xmlns:its="http://www.w3.org/2005/11/its" version="1.0">
+    <its:translateRule translate="no" selector="/fontconfig/*[not(self::description)]"/>
+  </its:rules>
+
+  <description>Load Android font files from /system/fonts</description>
+  <dir>/system/fonts</dir>
+
+  <include ignore_missing="yes">system-etc-fonts-xml-translated.conf</include>
+
+  <dir prefix="relative">../../share/fonts</dir>
+
+  <alias binding="strong">
+    <family>Symbol</family>
+    <prefer><family>Standard Symbols L</family></prefer>
+  </alias>
+
+  <alias binding="strong">
+    <family>Zapf Dingbats</family>
+    <prefer><family>Dingbats</family></prefer>
+  </alias>
+
+</fontconfig>