diff options
| author | Xin Li <delphij@google.com> | 2021-10-06 22:53:15 +0000 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2021-10-06 22:53:15 +0000 |
| commit | b8d5f294dde60bdbbdeef78ef2387b8b2b1041ce (patch) | |
| tree | 444ca76237c45026dcf4ccaf6569063f63af6e91 | |
| parent | 0c0aab381e467cfdd063f5e1034a33b8fd6728fd (diff) | |
| parent | 3c0260576ca99b40c19e47b3391ef71e082553e4 (diff) | |
| download | pdfium-b8d5f294dde60bdbbdeef78ef2387b8b2b1041ce.tar.gz | |
Merge Android 12android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1
Bug: 202323961
Merged-In: I91d9a32ea58079201ea01876e526acc0c7bafa64
Change-Id: I65d89ce75e666ac94fe9ff9c751eff5439cfbcaf
| -rw-r--r-- | Android.bp | 12 | ||||
| -rw-r--r-- | third_party/Android.bp | 1 |
2 files changed, 13 insertions, 0 deletions
diff --git a/Android.bp b/Android.bp index 750884b16..4af25048f 100644 --- a/Android.bp +++ b/Android.bp @@ -55,6 +55,14 @@ cc_defaults { "-DOPJ_STATIC", "-DPNG_PREFIX", "-DPNG_USE_READ_MACROS", + + // Do not export functions by default. Export only functions annotated + // with FPDF_EXPORT. + "-fvisibility=hidden", + + // Macro definitions to enable FPDF_EXPORT. + "-DCOMPONENT_BUILD", + "-DFPDF_IMPLEMENTATION", ], arch: { @@ -143,6 +151,10 @@ cc_library_shared { "libz", ], + ldflags: [ + "-Wl,-icf=all", + ], + export_include_dirs: ["public"], } diff --git a/third_party/Android.bp b/third_party/Android.bp index 64c6f0044..6ad307271 100644 --- a/third_party/Android.bp +++ b/third_party/Android.bp @@ -83,6 +83,7 @@ cc_library_static { cc_library_static { name: "libpdfium-libopenjpeg2", defaults: ["pdfium-third-party"], + visibility: ["//cts/hostsidetests/securitybulletin/securityPatch/CVE-2016-8332"], exclude_srcs: [ "libopenjpeg20/t1_generate_luts.c", |