[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - external/pdfium

[Andras Timar (via logerrit)]

 external/pdfium/AndroidNDK19.patch.1      |   16 ++++++++++++++++
 external/pdfium/UnpackedTarball_pdfium.mk |    2 ++
 2 files changed, 18 insertions(+)

New commits:
commit b7c967542c2d2bda4490ad021f932b0e3bdf3e3b
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Wed May 5 23:14:49 2021 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Wed May 12 10:02:26 2021 +0200

    pdfium build fix with Android NDK 19
    
    Change-Id: I618095efab0a7ed7babdabc36db6a473b1af78da
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115161
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    (cherry picked from commit 01765acee6b4931b6c69252b8357f81fd26e33bd)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115090
    Tested-by: Jenkins
    (cherry picked from commit 645cb7eda4fbe83ed748aafa41d210db274e22fc)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115279
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/external/pdfium/AndroidNDK19.patch.1 b/external/pdfium/AndroidNDK19.patch.1
new file mode 100644
index 000000000000..b0d1f0deae80
--- /dev/null
+++ b/external/pdfium/AndroidNDK19.patch.1
@@ -0,0 +1,16 @@
+diff -Naur pdfium.org/third_party/base/allocator/partition_allocator/page_allocator_internals_posix.h pdfium/third_party/base/allocator/partition_allocator/page_allocator_internals_posix.h
+--- pdfium.org/third_party/base/allocator/partition_allocator/page_allocator_internals_posix.h	2021-05-05 23:01:25.705057178 +0200
++++ pdfium/third_party/base/allocator/partition_allocator/page_allocator_internals_posix.h	2021-05-05 23:06:52.194081762 +0200
+@@ -15,6 +15,12 @@
+ #endif
+ #if defined(OS_ANDROID)
+ #include <sys/prctl.h>
++#ifndef PR_SET_VMA
++#define PR_SET_VMA 0x53564d41
++#endif
++#ifndef PR_SET_VMA_ANON_NAME
++#define PR_SET_VMA_ANON_NAME 0
++#endif
+ #endif
+ #if defined(OS_LINUX) || defined(OS_CHROMEOS)
+ #include <sys/resource.h>
diff --git a/external/pdfium/UnpackedTarball_pdfium.mk b/external/pdfium/UnpackedTarball_pdfium.mk
index f1b02473a062..cb9b571a25fe 100644
--- a/external/pdfium/UnpackedTarball_pdfium.mk
+++ b/external/pdfium/UnpackedTarball_pdfium.mk
@@ -16,6 +16,8 @@ pdfium_patches += windows7.patch.1
 pdfium_patches += c++20-comparison.patch
 # Use CoreGraphics.h instead of Carbon.h
 pdfium_patches += cg-instead-of-carbon.patch.1
+# Android NDK 19 - that is known to work well - does not have 2 defines
+pdfium_patches += AndroidNDK19.patch.1
 
 $(eval $(call gb_UnpackedTarball_UnpackedTarball,pdfium))