commit 0a9f64698138c7466fcdaa783b4adfaefa2a4bd2
author android-build-team Robot <android-build-team-robot@google.com> Tue Mar 23 01:04:04 2021 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Tue Mar 23 01:04:04 2021 +0000
tree 670b2008ff8484c5b755006915334d675da27b4d
parent d5c8340d3b561f9b097082d34ad6c978f469f1d2
parent 6b06a8e25bc1761789f24ae77321ce2b0a16a186

Snap for 7227300 from 6b06a8e25bc1761789f24ae77321ce2b0a16a186 to sc-release

Change-Id: I5eba548522596975029d97959d58b71ced735a86

Android.bp

diff --git a/Android.bp b/Android.bp
index 750884b..4af2504 100644
--- a/Android.bp
+++ b/Android.bp
@@ -55,6 +55,14 @@
         "-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 @@
         "libz",
     ],
 
+    ldflags: [
+      "-Wl,-icf=all",
+    ],
+
     export_include_dirs: ["public"],
 
 }

third_party/Android.bp

diff --git a/third_party/Android.bp b/third_party/Android.bp
index 6571fb1..3fcb08d 100644
--- a/third_party/Android.bp
+++ b/third_party/Android.bp
@@ -80,6 +80,7 @@
 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",