Updates Android.bp for new pdfium

Rewrite Android.bp to follow the new BUILD.gn structure.

Will try to set up auto update in following changes.

Bug: 155031873
Change-Id: I4a0632e1f5220ecbd257153a647b594a038f1229
Merged-Id: I4a0632e1f5220ecbd257153a647b594a038f1229

6 files changed, 93 insertions, 113 deletions

diff --git a/third_party/Android.bp b/third_party/Android.bp
index 2d294e0d2..824544efb 100644
--- a/third_party/Android.bp
+++ b/third_party/Android.bp
@@ -3,12 +3,98 @@ cc_defaults {
     defaults: [
         "pdfium-common"
     ],
+    visibility: ["//external/pdfium:__subpackages__"],
+}
+
+cc_library_static {
+    name: "libpdfium-third_party-base",
+    defaults: ["pdfium-third-party"],
+    visibility: ["//external/pdfium:__subpackages__"],
+
+    arch: {
+        arm: {
+            cflags: [
+                "-DARCH_CPU_32_BITS",
+                "-DARCH_CPU_ARMEL",
+            ],
+        },
+        arm64: {
+            cflags: [
+                "-DARCH_CPU_64_BITS",
+                "-DARCH_CPU_ARM64",
+            ],
+        },
+        x86: {
+            cflags: [
+                "-DARCH_CPU_32_BITS",
+                "-DARCH_CPU_X86",
+            ],
+        },
+        x86_64: {
+            cflags: [
+                "-DARCH_CPU_64_BITS",
+                "-DARCH_CPU_X86_64",
+            ],
+        },
+    },
+
+    srcs: [
+        "base/debug/*.cc",
+        "base/allocator/partition_allocator/*.cc",
+    ],
+}
+
+cc_library_static {
+    name: "libpdfium-lcms2",
+    defaults: ["pdfium-third-party"],
+
+    cflags: [
+      // cmslut.cc is sloppy with aggregate initialization. Version 2.7 of this
+      // library doesn't appear to have this problem.
+      "-Wno-missing-braces",
+
+      // FindPrev() in cmsplugin.c is unused.
+      "-Wno-unused-function",
+    ],
+
+    srcs: [
+        "lcms/src/*.c",
+    ],
+}
+
+cc_library_static {
+    name: "libpdfium-libopenjpeg2",
+    defaults: ["pdfium-third-party"],
+
+    exclude_srcs: [
+        "libopenjpeg20/t1_generate_luts.c",
+    ],
+
+    srcs: [
+        "libopenjpeg20/*.c",
+    ],
+}
+
+cc_library_static {
+    name: "libpdfium-agg",
+    defaults: ["pdfium-third-party"],
+
+    cflags: [
+        // calc_butt_cap() in agg_vcgen_stroke.cpp is unused.
+        "-Wno-unused-function",
+    ],
+
+    srcs: [
+        "agg23/*.cpp",
+    ]
+}
+
+cc_library_static {
+    name: "libpdfium-skia_shared",
+    defaults: ["pdfium-third-party"],
+
+    srcs: [
+        "skia_shared/*.cpp",
+    ],
 }
 
-build = [
-    "pdfiumfx_agg.bp",
-    "pdfiumbigint.bp",
-    "pdfiumlcms2.bp",
-    "pdfiumpdfiumbase.bp",
-    "pdfiumfx_libopenjpeg.bp",
-]
diff --git a/third_party/pdfiumbigint.bp b/third_party/pdfiumbigint.bp
deleted file mode 100644
index fbd92a9a1..000000000
--- a/third_party/pdfiumbigint.bp
+++ /dev/null
@@ -1,11 +0,0 @@
-cc_library_static {
-    name: "libpdfiumbigint",
-    defaults: ["pdfium-third-party"],
-
-    srcs: [
-        "bigint/BigInteger.cc",
-        "bigint/BigIntegerUtils.cc",
-        "bigint/BigUnsigned.cc",
-        "bigint/BigUnsignedInABase.cc",
-    ],
-}
diff --git a/third_party/pdfiumfx_agg.bp b/third_party/pdfiumfx_agg.bp
deleted file mode 100644
index f55fa6715..000000000
--- a/third_party/pdfiumfx_agg.bp
+++ /dev/null
@@ -1,20 +0,0 @@
-cc_library_static {
-    name: "libpdfiumfx_agg",
-    defaults: ["pdfium-third-party"],
-
-    cflags: [
-        "-Wno-unused-function"
-    ],
-
-    static_libs: [
-        "libpdfiumfxcrt",
-    ],
-
-    srcs: [
-        "agg23/agg_curves.cpp",
-        "agg23/agg_path_storage.cpp",
-        "agg23/agg_rasterizer_scanline_aa.cpp",
-        "agg23/agg_vcgen_dash.cpp",
-        "agg23/agg_vcgen_stroke.cpp",
-    ],
-}
diff --git a/third_party/pdfiumfx_libopenjpeg.bp b/third_party/pdfiumfx_libopenjpeg.bp
deleted file mode 100644
index 46b594ddb..000000000
--- a/third_party/pdfiumfx_libopenjpeg.bp
+++ /dev/null
@@ -1,27 +0,0 @@
-cc_library_static {
-    name: "libpdfiumfx_libopenjpeg",
-    defaults: ["pdfium-third-party"],
-
-    srcs: [
-        "libopenjpeg20/bio.c",
-        "libopenjpeg20/cio.c",
-        "libopenjpeg20/dwt.c",
-        "libopenjpeg20/event.c",
-        "libopenjpeg20/function_list.c",
-        "libopenjpeg20/image.c",
-        "libopenjpeg20/invert.c",
-        "libopenjpeg20/j2k.c",
-        "libopenjpeg20/jp2.c",
-        "libopenjpeg20/mct.c",
-        "libopenjpeg20/mqc.c",
-        "libopenjpeg20/openjpeg.c",
-        "libopenjpeg20/opj_clock.c",
-        "libopenjpeg20/pi.c",
-        "libopenjpeg20/sparse_array.c",
-        "libopenjpeg20/t1.c",
-        "libopenjpeg20/t2.c",
-        "libopenjpeg20/tcd.c",
-        "libopenjpeg20/tgt.c",
-        "libopenjpeg20/thread.c",
-    ],
-}
diff --git a/third_party/pdfiumlcms2.bp b/third_party/pdfiumlcms2.bp
deleted file mode 100644
index d55287bfd..000000000
--- a/third_party/pdfiumlcms2.bp
+++ /dev/null
@@ -1,37 +0,0 @@
-cc_library_static {
-    name: "libpdfiumlcms2",
-    defaults: ["pdfium-third-party"],
-
-    cflags: [
-        "-Wno-missing-braces",
-    ],
-
-    srcs: [
-        "lcms/src/cmsalpha.c",
-        "lcms/src/cmscam02.c",
-        "lcms/src/cmscgats.c",
-        "lcms/src/cmscnvrt.c",
-        "lcms/src/cmserr.c",
-        "lcms/src/cmsgamma.c",
-        "lcms/src/cmsgmt.c",
-        "lcms/src/cmshalf.c",
-        "lcms/src/cmsintrp.c",
-        "lcms/src/cmsio0.c",
-        "lcms/src/cmsio1.c",
-        "lcms/src/cmslut.c",
-        "lcms/src/cmsmd5.c",
-        "lcms/src/cmsmtrx.c",
-        "lcms/src/cmsnamed.c",
-        "lcms/src/cmsopt.c",
-        "lcms/src/cmspack.c",
-        "lcms/src/cmspcs.c",
-        "lcms/src/cmsplugin.c",
-        "lcms/src/cmsps2.c",
-        "lcms/src/cmssamp.c",
-        "lcms/src/cmssm.c",
-        "lcms/src/cmstypes.c",
-        "lcms/src/cmsvirt.c",
-        "lcms/src/cmswtpnt.c",
-        "lcms/src/cmsxform.c",
-    ],
-}
diff --git a/third_party/pdfiumpdfiumbase.bp b/third_party/pdfiumpdfiumbase.bp
deleted file mode 100644
index fc72eeb5b..000000000
--- a/third_party/pdfiumpdfiumbase.bp
+++ /dev/null
@@ -1,11 +0,0 @@
-cc_library_static {
-    name: "libpdfiumpdfiumbase",
-    defaults: ["pdfium-third-party"],
-
-    srcs: [
-        "base/allocator/partition_allocator/address_space_randomization.cc",
-        "base/allocator/partition_allocator/page_allocator.cc",
-        "base/allocator/partition_allocator/partition_alloc.cc",
-        "base/allocator/partition_allocator/spin_lock.cc",
-    ],
-}