diff options
author | Xin Li <delphij@google.com> | 2021-08-14 06:31:00 +0000 |
---|---|---|
committer | Xin Li <delphij@google.com> | 2021-08-14 06:31:00 +0000 |
commit | 7ef581cef5f326325efa50a222098ff9d60a6e7e (patch) | |
tree | 670b2008ff8484c5b755006915334d675da27b4d | |
parent | 2955e260b523ee526dfb730f645cbf551e9e71eb (diff) | |
parent | 6b06a8e25bc1761789f24ae77321ce2b0a16a186 (diff) | |
download | pdfium-7ef581cef5f326325efa50a222098ff9d60a6e7e.tar.gz |
Merge sc-dev-plus-aosp-without-vendor@7634622
Merged-In: I5ed403aa88110f924d1d9d1f69793511662737ee
Change-Id: I71378578341b670b8115cd1843f389f1ec35502c
-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 6571fb1bd..3fcb08d80 100644 --- a/third_party/Android.bp +++ b/third_party/Android.bp @@ -80,6 +80,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", |