Android Support

lineCode · Jan 22, 2023 · 9b29c07 · 9b29c07
1 parent 177c3fa
commit 9b29c07
Show file tree

Hide file tree

Showing 29 changed files with 3,331 additions and 7,577 deletions.
diff --git a/Source/PDF_Reader/PDF_Reader.Build.cs b/Source/PDF_Reader/PDF_Reader.Build.cs
@@ -10,6 +10,8 @@ public PDF_Reader(ReadOnlyTargetRules Target) : base(Target)
 	{
         PCHUsage = ModuleRules.PCHUsageMode.UseExplicitOrSharedPCHs;
 
+		PublicIncludePaths.Add(Path.Combine(EngineDirectory, "Source", "Runtime", "Core", "Public", "Android"));
+
         if (UnrealTargetPlatform.Win64 == Target.Platform)
         {
             string Location_PDFium = "../Source/PDF_Reader/ThirdParty/pdfium/Windows/include";
@@ -23,7 +25,9 @@ public PDF_Reader(ReadOnlyTargetRules Target) : base(Target)
         {
             string Location_PDFium = "../Source/PDF_Reader/ThirdParty/pdfium/Android/include";
             PrivateIncludePaths.Add(Location_PDFium);
-            PublicAdditionalLibraries.Add(Path.Combine(ModuleDirectory, "ThirdParty", "pdfium", "Android", "lib", "arm64-v8a", "libpdfium.so"));
+            PublicAdditionalLibraries.Add(Path.Combine(ModuleDirectory, "ThirdParty", "pdfium", "Android", "lib", "arm64-v8a", "libmodft2.so"));
+            PublicAdditionalLibraries.Add(Path.Combine(ModuleDirectory, "ThirdParty", "pdfium", "Android", "lib", "arm64-v8a", "libmodpdfium.so"));
+            PublicAdditionalLibraries.Add(Path.Combine(ModuleDirectory, "ThirdParty", "pdfium", "Android", "lib", "arm64-v8a", "libmodpng.so"));
 
             AdditionalPropertiesForReceipt.Add("AndroidPlugin", Path.Combine(ModuleDirectory, "PDF_Reader_UPL_Android.xml"));
         }

diff --git a/Source/PDF_Reader/PDF_Reader_UPL_Android.xml b/Source/PDF_Reader/PDF_Reader_UPL_Android.xml
@@ -12,9 +12,17 @@
 	<resourceCopies>
 		<if condition="bCpuArchSupported">
 			<true>
-				<log text="Copying libpdfium.so"/>
-				<copyFile src="$S(PluginDir)/ThirdParty/pdfium/Android/lib/arm64-v8a/libpdfium.so"
-							dst="$S(BuildDir)/libs/$S(Architecture)/libpdfium.so" />
+				<log text="Copying libmodft2.so"/>
+				<copyFile src="$S(PluginDir)/ThirdParty/pdfium/Android/lib/arm64-v8a/libmodft2.so"
+							dst="$S(BuildDir)/libs/$S(Architecture)/libmodft2.so" />
+
+				<log text="Copying libmodpdfium.so"/>
+				<copyFile src="$S(PluginDir)/ThirdParty/pdfium/Android/lib/arm64-v8a/libmodpdfium.so"
+							dst="$S(BuildDir)/libs/$S(Architecture)/libmodpdfium.so" />
+
+				<log text="Copying libmodpng.so"/>
+				<copyFile src="$S(PluginDir)/ThirdParty/pdfium/Android/lib/arm64-v8a/libmodpng.so"
+							dst="$S(BuildDir)/libs/$S(Architecture)/libmodpng.so" />
 			</true>
 		</if>
 	</resourceCopies>
@@ -24,7 +32,9 @@
 	<soLoadLibrary>
 		<if condition="bCpuArchSupported">
 			<true>
-				<loadLibrary name="libpdfium" failmsg="pdfium library not loaded and may be required for PDF_Reader." />
+				<loadLibrary name="libmodft2" failmsg="pdfium library not loaded and may be required for PDF_Reader." />
+				<loadLibrary name="libmodpdfium" failmsg="pdfium library not loaded and may be required for PDF_Reader." />
+				<loadLibrary name="libmodpng" failmsg="pdfium library not loaded and may be required for PDF_Reader." />
 			</true>
 		</if>
 	</soLoadLibrary>

diff --git a/Source/PDF_Reader/Private/PDF_ReaderBPLibrary.cpp b/Source/PDF_Reader/Private/PDF_ReaderBPLibrary.cpp
@@ -37,7 +37,13 @@ bool UPDF_ReaderBPLibrary::Read_PDF(TMap<UTexture2D*, FVector2D>& OutPages, bool
 
 	if (InBytes.Num() > 0)
 	{
+#ifdef _WIN64
 		Document = FPDF_LoadMemDocument64(InBytes.GetData(), InBytes.Num(), TCHAR_TO_UTF8(*InPDF_Pass));
+#endif
+
+#ifdef __ANDROID__
+		Document = FPDF_LoadMemDocument(InBytes.GetData(), InBytes.Num(), TCHAR_TO_UTF8(*InPDF_Pass));
+#endif
 
 		if (bUseDebug)
 		{

diff --git a/Source/PDF_Reader/ThirdParty/pdfium/Android/include/cpp/fpdf_deleters.h b/Source/PDF_Reader/ThirdParty/pdfium/Android/include/cpp/fpdf_deleters.h
diff --git a/Source/PDF_Reader/ThirdParty/pdfium/Android/include/cpp/fpdf_scopers.h b/Source/PDF_Reader/ThirdParty/pdfium/Android/include/cpp/fpdf_scopers.h