diff options
| author | Andras Timar <andras.timar@collabora.com> | 2021-05-05 23:14:49 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2021-05-06 14:14:19 +0200 |
| commit | 645cb7eda4fbe83ed748aafa41d210db274e22fc (patch) | |
| tree | 810164c3ee87a9089a10d7ffb458de2d0cbcfce9 /external/pdfium | |
| parent | f05c57b96293c80825be66162ca7bf3e4dbc8ea2 (diff) | |
pdfium build fix with Android NDK 19
Change-Id: I618095efab0a7ed7babdabc36db6a473b1af78da
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115161
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
(cherry picked from commit 01765acee6b4931b6c69252b8357f81fd26e33bd)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115090
Tested-by: Jenkins
Diffstat (limited to 'external/pdfium')
| -rw-r--r-- | external/pdfium/AndroidNDK19.patch.1 | 16 | ||||
| -rw-r--r-- | external/pdfium/UnpackedTarball_pdfium.mk | 2 |
2 files changed, 18 insertions, 0 deletions
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 97da4dc71caa..4e7d5c1ad6b4 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 # Work around <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=94141> "c++20 rewritten operator== # recursive call mixing friend and external operators for template class" in GCC with |