Turn on chromium_code (except -Wsign-compare, for now) for pdfium
[pdfium.git] / BUILD.gn
index b52913b..fa6c906 100644 (file)
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -3,33 +3,30 @@
 # found in the LICENSE file.
 
 import("//testing/test.gni")
-
-pdf_use_skia = false
-
-declare_args() {
-  # On Android there's no system FreeType. On Windows and Mac, only a few
-  # methods are used from it.
-  bundle_freetype = !is_linux
-}
+import("pdfium.gni")
 
 config("pdfium_config") {
   cflags = []
   include_dirs = [ "third_party/freetype/include" ]
   defines = [
-    "_FPDFSDK_LIB",
-    "_NO_GDIPLUS_",  # workaround text rendering issues on Windows
     "OPJ_STATIC",
+    "V8_DEPRECATION_WARNINGS",
+    "_CRT_SECURE_NO_WARNINGS",
   ]
 
   if (pdf_use_skia) {
     defines += [ "_SKIA_SUPPORT_" ]
   }
 
+  if (pdf_enable_v8) {
+    defines += [ "PDF_ENABLE_V8" ]
+  }
+
   if (is_linux) {
-    if (cpu_arch == "x64") {
+    if (current_cpu == "x64") {
       defines += [ "_FX_CPU_=_FX_X64_" ]
       cflags += [ "-fPIC" ]
-    } else if (cpu_arch == "x86") {
+    } else if (current_cpu == "x86") {
       defines += [ "_FX_CPU_=_FX_X86_" ]
     }
   }
@@ -44,29 +41,25 @@ config("pdfium_config") {
     ]
   }
 
-  if (bundle_freetype) {
-    defines += [ "FT2_BUILD_LIBRARY" ]
+  if (is_clang) {
+    # TODO(thestig): Fix all instances, remove this, pdfium:29
+    cflags += [ "-Wno-sign-compare" ]
   }
 }
 
 static_library("pdfium") {
   sources = [
-    "fpdfsdk/include/fpdfdoc.h",
-    "fpdfsdk/include/fpdfedit.h",
-    "fpdfsdk/include/fpdfformfill.h",
-    "fpdfsdk/include/fpdftext.h",
-    "fpdfsdk/include/fpdfview.h",
-    "fpdfsdk/include/fpdf_dataavail.h",
-    "fpdfsdk/include/fpdf_flatten.h",
-    "fpdfsdk/include/fpdf_progressive.h",
-    "fpdfsdk/include/fpdf_searchex.h",
-    "fpdfsdk/include/fpdf_sysfontinfo.h",
-    "fpdfsdk/include/fpdf_ext.h",
-    "fpdfsdk/include/fpdf_sysfontinfo.h",
     "fpdfsdk/include/fsdk_actionhandler.h",
     "fpdfsdk/include/fsdk_annothandler.h",
     "fpdfsdk/include/fsdk_baseannot.h",
     "fpdfsdk/include/fsdk_baseform.h",
+    "fpdfsdk/src/fpdf_dataavail.cpp",
+    "fpdfsdk/src/fpdf_ext.cpp",
+    "fpdfsdk/src/fpdf_flatten.cpp",
+    "fpdfsdk/src/fpdf_progressive.cpp",
+    "fpdfsdk/src/fpdf_searchex.cpp",
+    "fpdfsdk/src/fpdf_sysfontinfo.cpp",
+    "fpdfsdk/src/fpdf_transformpage.cpp",
     "fpdfsdk/src/fpdfdoc.cpp",
     "fpdfsdk/src/fpdfeditimg.cpp",
     "fpdfsdk/src/fpdfeditpage.cpp",
@@ -75,31 +68,35 @@ static_library("pdfium") {
     "fpdfsdk/src/fpdfsave.cpp",
     "fpdfsdk/src/fpdftext.cpp",
     "fpdfsdk/src/fpdfview.cpp",
-    "fpdfsdk/src/fpdf_dataavail.cpp",
-    "fpdfsdk/src/fpdf_ext.cpp",
-    "fpdfsdk/src/fpdf_flatten.cpp",
-    "fpdfsdk/src/fpdf_progressive.cpp",
-    "fpdfsdk/src/fpdf_searchex.cpp",
-    "fpdfsdk/src/fpdf_sysfontinfo.cpp",
     "fpdfsdk/src/fsdk_actionhandler.cpp",
     "fpdfsdk/src/fsdk_annothandler.cpp",
     "fpdfsdk/src/fsdk_baseannot.cpp",
     "fpdfsdk/src/fsdk_baseform.cpp",
     "fpdfsdk/src/fsdk_mgr.cpp",
     "fpdfsdk/src/fsdk_rendercontext.cpp",
-    "fpdfsdk/src/fpdfsdkdll.rc",
-    "fpdfsdk/src/resource.h",
-    "fpdfsdk/include/fpdf_transformpage.h",
-    "fpdfsdk/src/fpdf_transformpage.cpp",
+    "public/fpdf_dataavail.h",
+    "public/fpdf_doc.h",
+    "public/fpdf_edit.h",
+    "public/fpdf_ext.h",
+    "public/fpdf_flatten.h",
+    "public/fpdf_formfill.h",
+    "public/fpdf_fwlevent.h",
+    "public/fpdf_ppo.h",
+    "public/fpdf_progressive.h",
+    "public/fpdf_save.h",
+    "public/fpdf_searchex.h",
+    "public/fpdf_sysfontinfo.h",
+    "public/fpdf_text.h",
+    "public/fpdf_transformpage.h",
+    "public/fpdfview.h",
   ]
 
   libs = []
-  configs -= [ "//build/config/compiler:chromium_code" ]
-  configs += [ ":pdfium_config", "//build/config/compiler:no_chromium_code" ]
+  configs += [ ":pdfium_config" ]
 
   deps = [
     "third_party:bigint",
-    "third_party:safemath",
+    "third_party:pdfium_base",
     ":fdrm",
     ":formfiller",
     ":fpdfapi",
@@ -110,27 +107,66 @@ static_library("pdfium") {
     ":fxedit",
     ":fxge",
     ":javascript",
-    ":jsapi",
     ":pdfwindow",
   ]
 
   if (is_win) {
-    libs += [ "advapi32.lib", "gdi32.lib", "user32.lib" ]
+    libs += [
+      "advapi32.lib",
+      "gdi32.lib",
+      "user32.lib",
+    ]
   }
 
   if (is_mac) {
-    libs += [ "AppKit.framework", "CoreFoundation.framework" ]
+    libs += [
+      "AppKit.framework",
+      "CoreFoundation.framework",
+    ]
   }
 
-  if (bundle_freetype) {
-    deps += [ "third_party:freetype" ]
+  if (pdfium_bundle_freetype) {
+    deps += [ "third_party:fx_freetype" ]
   } else {
     libs += [ "freetype" ]
   }
 }
 
-# Targets below this are only visible within this file.
-visibility = [ ":*" ]
+source_set("test_support") {
+  testonly = true
+  sources = [
+    "testing/fx_string_testhelpers.cpp",
+    "testing/fx_string_testhelpers.h",
+    "testing/test_support.cpp",
+    "testing/test_support.h",
+  ]
+  deps = [
+    "//testing/gmock",
+    "//testing/gtest",
+    ":pdfium",
+  ]
+  include_dirs = [
+    "."
+  ]
+  if (pdf_enable_v8) {
+    deps += [
+      "//v8",
+      "//v8:v8_libplatform",
+    ]
+    include_dirs += [
+      "//v8",
+      "//v8/include",
+    ]
+  }
+  configs += [ ":pdfium_config" ]
+}
+
+# Targets below this are only visible within this file (and to the
+# top-level gn_visibility target used to help gn_all build everything).
+visibility = [
+  ":*",
+  "//:gn_visibility",
+]
 
 static_library("fdrm") {
   sources = [
@@ -139,8 +175,7 @@ static_library("fdrm") {
     "core/src/fdrm/crypto/fx_crypt_aes.cpp",
     "core/src/fdrm/crypto/fx_crypt_sha.cpp",
   ]
-  configs -= [ "//build/config/compiler:chromium_code" ]
-  configs += [ ":pdfium_config", "//build/config/compiler:no_chromium_code" ]
+  configs += [ ":pdfium_config" ]
 }
 
 static_library("fpdfdoc") {
@@ -162,20 +197,18 @@ static_library("fpdfdoc") {
     "core/src/fpdfdoc/doc_ocg.cpp",
     "core/src/fpdfdoc/doc_tagged.cpp",
     "core/src/fpdfdoc/doc_utils.cpp",
+    "core/src/fpdfdoc/doc_utils.h",
     "core/src/fpdfdoc/doc_viewerPreferences.cpp",
     "core/src/fpdfdoc/doc_vt.cpp",
     "core/src/fpdfdoc/doc_vtmodule.cpp",
     "core/src/fpdfdoc/pdf_vt.h",
     "core/src/fpdfdoc/tagged_int.h",
   ]
-  configs -= [ "//build/config/compiler:chromium_code" ]
-  configs += [ ":pdfium_config", "//build/config/compiler:no_chromium_code" ]
+  configs += [ ":pdfium_config" ]
 }
 
-
 static_library("fpdfapi") {
   sources = [
-    "core/include/fpdfapi/fpdfapi.h",
     "core/include/fpdfapi/fpdf_module.h",
     "core/include/fpdfapi/fpdf_objects.h",
     "core/include/fpdfapi/fpdf_page.h",
@@ -184,12 +217,11 @@ static_library("fpdfapi") {
     "core/include/fpdfapi/fpdf_render.h",
     "core/include/fpdfapi/fpdf_resource.h",
     "core/include/fpdfapi/fpdf_serial.h",
+    "core/include/fpdfapi/fpdfapi.h",
     "core/src/fpdfapi/fpdf_basic_module.cpp",
-    "core/src/fpdfapi/fpdf_cmaps/cmap_int.h",
     "core/src/fpdfapi/fpdf_cmaps/CNS1/Adobe-CNS1-UCS2_5.cpp",
     "core/src/fpdfapi/fpdf_cmaps/CNS1/B5pc-H_0.cpp",
     "core/src/fpdfapi/fpdf_cmaps/CNS1/B5pc-V_0.cpp",
-    "core/src/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.cpp",
     "core/src/fpdfapi/fpdf_cmaps/CNS1/CNS-EUC-H_0.cpp",
     "core/src/fpdfapi/fpdf_cmaps/CNS1/CNS-EUC-V_0.cpp",
     "core/src/fpdfapi/fpdf_cmaps/CNS1/ETen-B5-H_0.cpp",
@@ -201,9 +233,8 @@ static_library("fpdfapi") {
     "core/src/fpdfapi/fpdf_cmaps/CNS1/UniCNS-UCS2-H_3.cpp",
     "core/src/fpdfapi/fpdf_cmaps/CNS1/UniCNS-UCS2-V_3.cpp",
     "core/src/fpdfapi/fpdf_cmaps/CNS1/UniCNS-UTF16-H_0.cpp",
-    "core/src/fpdfapi/fpdf_cmaps/fpdf_cmaps.cpp",
+    "core/src/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.cpp",
     "core/src/fpdfapi/fpdf_cmaps/GB1/Adobe-GB1-UCS2_5.cpp",
-    "core/src/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.cpp",
     "core/src/fpdfapi/fpdf_cmaps/GB1/GB-EUC-H_0.cpp",
     "core/src/fpdfapi/fpdf_cmaps/GB1/GB-EUC-V_0.cpp",
     "core/src/fpdfapi/fpdf_cmaps/GB1/GBK-EUC-H_2.cpp",
@@ -216,6 +247,7 @@ static_library("fpdfapi") {
     "core/src/fpdfapi/fpdf_cmaps/GB1/GBpc-EUC-V_0.cpp",
     "core/src/fpdfapi/fpdf_cmaps/GB1/UniGB-UCS2-H_4.cpp",
     "core/src/fpdfapi/fpdf_cmaps/GB1/UniGB-UCS2-V_4.cpp",
+    "core/src/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.cpp",
     "core/src/fpdfapi/fpdf_cmaps/Japan1/83pv-RKSJ-H_1.cpp",
     "core/src/fpdfapi/fpdf_cmaps/Japan1/90ms-RKSJ-H_2.cpp",
     "core/src/fpdfapi/fpdf_cmaps/Japan1/90ms-RKSJ-V_2.cpp",
@@ -225,7 +257,6 @@ static_library("fpdfapi") {
     "core/src/fpdfapi/fpdf_cmaps/Japan1/Add-RKSJ-H_1.cpp",
     "core/src/fpdfapi/fpdf_cmaps/Japan1/Add-RKSJ-V_1.cpp",
     "core/src/fpdfapi/fpdf_cmaps/Japan1/Adobe-Japan1-UCS2_4.cpp",
-    "core/src/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.cpp",
     "core/src/fpdfapi/fpdf_cmaps/Japan1/EUC-H_1.cpp",
     "core/src/fpdfapi/fpdf_cmaps/Japan1/EUC-V_1.cpp",
     "core/src/fpdfapi/fpdf_cmaps/Japan1/Ext-RKSJ-H_2.cpp",
@@ -235,11 +266,9 @@ static_library("fpdfapi") {
     "core/src/fpdfapi/fpdf_cmaps/Japan1/UniJIS-UCS2-HW-V_4.cpp",
     "core/src/fpdfapi/fpdf_cmaps/Japan1/UniJIS-UCS2-H_4.cpp",
     "core/src/fpdfapi/fpdf_cmaps/Japan1/UniJIS-UCS2-V_4.cpp",
-    "core/src/fpdfapi/fpdf_cmaps/Japan1/UniJIS-UTF16-H_5.cpp",
-    "core/src/fpdfapi/fpdf_cmaps/Japan1/UniJIS-UTF16-V_5.cpp",
     "core/src/fpdfapi/fpdf_cmaps/Japan1/V_1.cpp",
+    "core/src/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.cpp",
     "core/src/fpdfapi/fpdf_cmaps/Korea1/Adobe-Korea1-UCS2_2.cpp",
-    "core/src/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.cpp",
     "core/src/fpdfapi/fpdf_cmaps/Korea1/KSC-EUC-H_0.cpp",
     "core/src/fpdfapi/fpdf_cmaps/Korea1/KSC-EUC-V_0.cpp",
     "core/src/fpdfapi/fpdf_cmaps/Korea1/KSCms-UHC-HW-H_1.cpp",
@@ -250,6 +279,9 @@ static_library("fpdfapi") {
     "core/src/fpdfapi/fpdf_cmaps/Korea1/UniKS-UCS2-H_1.cpp",
     "core/src/fpdfapi/fpdf_cmaps/Korea1/UniKS-UCS2-V_1.cpp",
     "core/src/fpdfapi/fpdf_cmaps/Korea1/UniKS-UTF16-H_0.cpp",
+    "core/src/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.cpp",
+    "core/src/fpdfapi/fpdf_cmaps/cmap_int.h",
+    "core/src/fpdfapi/fpdf_cmaps/fpdf_cmaps.cpp",
     "core/src/fpdfapi/fpdf_edit/editint.h",
     "core/src/fpdfapi/fpdf_edit/fpdf_edit_content.cpp",
     "core/src/fpdfapi/fpdf_edit/fpdf_edit_create.cpp",
@@ -260,7 +292,6 @@ static_library("fpdfapi") {
     "core/src/fpdfapi/fpdf_font/fpdf_font.cpp",
     "core/src/fpdfapi/fpdf_font/fpdf_font_charset.cpp",
     "core/src/fpdfapi/fpdf_font/fpdf_font_cid.cpp",
-    "core/src/fpdfapi/fpdf_font/fpdf_font_utility.cpp",
     "core/src/fpdfapi/fpdf_font/ttgsubtable.cpp",
     "core/src/fpdfapi/fpdf_font/ttgsubtable.h",
     "core/src/fpdfapi/fpdf_page/fpdf_page.cpp",
@@ -274,12 +305,10 @@ static_library("fpdfapi") {
     "core/src/fpdfapi/fpdf_page/fpdf_page_path.cpp",
     "core/src/fpdfapi/fpdf_page/fpdf_page_pattern.cpp",
     "core/src/fpdfapi/fpdf_page/pageint.h",
-    "core/src/fpdfapi/fpdf_parser/filters_int.h",
     "core/src/fpdfapi/fpdf_parser/fpdf_parser_decode.cpp",
     "core/src/fpdfapi/fpdf_parser/fpdf_parser_document.cpp",
     "core/src/fpdfapi/fpdf_parser/fpdf_parser_encrypt.cpp",
     "core/src/fpdfapi/fpdf_parser/fpdf_parser_fdf.cpp",
-    "core/src/fpdfapi/fpdf_parser/fpdf_parser_filters.cpp",
     "core/src/fpdfapi/fpdf_parser/fpdf_parser_objects.cpp",
     "core/src/fpdfapi/fpdf_parser/fpdf_parser_parser.cpp",
     "core/src/fpdfapi/fpdf_parser/fpdf_parser_utility.cpp",
@@ -291,8 +320,7 @@ static_library("fpdfapi") {
     "core/src/fpdfapi/fpdf_render/fpdf_render_text.cpp",
     "core/src/fpdfapi/fpdf_render/render_int.h",
   ]
-  configs -= [ "//build/config/compiler:chromium_code" ]
-  configs += [ ":pdfium_config", "//build/config/compiler:no_chromium_code" ]
+  configs += [ ":pdfium_config" ]
 }
 
 static_library("fpdftext") {
@@ -305,15 +333,22 @@ static_library("fpdftext") {
     "core/src/fpdftext/txtproc.h",
     "core/src/fpdftext/unicodenormalization.cpp",
     "core/src/fpdftext/unicodenormalizationdata.cpp",
+    "core/src/fpdftext/unicodenormalizationdata.h",
   ]
-  configs -= [ "//build/config/compiler:chromium_code" ]
-  configs += [ ":pdfium_config", "//build/config/compiler:no_chromium_code" ]
+  configs += [ ":pdfium_config" ]
 }
 
 static_library("fxcodec") {
+  deps = [
+    "third_party:fx_lcms2",
+    "third_party:fx_libjpeg",
+    "third_party:fx_libopenjpeg",
+    "third_party:fx_zlib",
+  ]
   sources = [
     "core/include/fxcodec/fx_codec.h",
     "core/include/fxcodec/fx_codec_def.h",
+    "core/include/fxcodec/fx_codec_flate.h",
     "core/include/fxcodec/fx_codec_provider.h",
     "core/src/fxcodec/codec/codec_int.h",
     "core/src/fxcodec/codec/fx_codec.cpp",
@@ -324,55 +359,23 @@ static_library("fxcodec") {
     "core/src/fxcodec/codec/fx_codec_jbig_enc.cpp",
     "core/src/fxcodec/codec/fx_codec_jpeg.cpp",
     "core/src/fxcodec/codec/fx_codec_jpx_opj.cpp",
-    "core/src/fxcodec/fx_libopenjpeg/include/fx_openjpeg.h",
-    "core/src/fxcodec/fx_libopenjpeg/src/fx_bio.c",
-    "core/src/fxcodec/fx_libopenjpeg/src/fx_cio.c",
-    "core/src/fxcodec/fx_libopenjpeg/src/fx_dwt.c",
-    "core/src/fxcodec/fx_libopenjpeg/src/fx_event.c",
-    "core/src/fxcodec/fx_libopenjpeg/src/fx_function_list.c",
-    "core/src/fxcodec/fx_libopenjpeg/src/fx_image.c",
-    "core/src/fxcodec/fx_libopenjpeg/src/fx_invert.c",
-    "core/src/fxcodec/fx_libopenjpeg/src/fx_j2k.c",
-    "core/src/fxcodec/fx_libopenjpeg/src/fx_j2k_lib.c",
-    "core/src/fxcodec/fx_libopenjpeg/src/fx_jpt.c",
-    "core/src/fxcodec/fx_libopenjpeg/src/fx_mct.c",
-    "core/src/fxcodec/fx_libopenjpeg/src/fx_mqc.c",
-    "core/src/fxcodec/fx_libopenjpeg/src/fx_openjpeg.c",
-    "core/src/fxcodec/fx_libopenjpeg/src/fx_openjpeg_jp2.c",
-    "core/src/fxcodec/fx_libopenjpeg/src/fx_opj_clock.c",
-    "core/src/fxcodec/fx_libopenjpeg/src/fx_pi.c",
-    "core/src/fxcodec/fx_libopenjpeg/src/fx_raw.c",
-    "core/src/fxcodec/fx_libopenjpeg/src/fx_t1.c",
-    "core/src/fxcodec/fx_libopenjpeg/src/fx_t1_generate_luts.c",
-    "core/src/fxcodec/fx_libopenjpeg/src/fx_t2.c",
-    "core/src/fxcodec/fx_libopenjpeg/src/fx_tcd.c",
-    "core/src/fxcodec/fx_libopenjpeg/src/fx_tgt.c",
-    "core/src/fxcodec/fx_zlib/include/fx_zlib.h",
-    "core/src/fxcodec/fx_zlib/src/fx_zlib_adler32.c",
-    "core/src/fxcodec/fx_zlib/src/fx_zlib_compress.c",
-    "core/src/fxcodec/fx_zlib/src/fx_zlib_crc32.c",
-    "core/src/fxcodec/fx_zlib/src/fx_zlib_deflate.c",
-    "core/src/fxcodec/fx_zlib/src/fx_zlib_gzclose.c",
-    "core/src/fxcodec/fx_zlib/src/fx_zlib_gzlib.c",
-    "core/src/fxcodec/fx_zlib/src/fx_zlib_gzread.c",
-    "core/src/fxcodec/fx_zlib/src/fx_zlib_gzwrite.c",
-    "core/src/fxcodec/fx_zlib/src/fx_zlib_infback.c",
-    "core/src/fxcodec/fx_zlib/src/fx_zlib_inffast.c",
-    "core/src/fxcodec/fx_zlib/src/fx_zlib_inflate.c",
-    "core/src/fxcodec/fx_zlib/src/fx_zlib_inftrees.c",
-    "core/src/fxcodec/fx_zlib/src/fx_zlib_trees.c",
-    "core/src/fxcodec/fx_zlib/src/fx_zlib_uncompr.c",
-    "core/src/fxcodec/fx_zlib/src/fx_zlib_zutil.c",
+    "core/src/fxcodec/jbig2/JBig2_ArithDecoder.cpp",
     "core/src/fxcodec/jbig2/JBig2_ArithDecoder.h",
     "core/src/fxcodec/jbig2/JBig2_ArithIntDecoder.cpp",
     "core/src/fxcodec/jbig2/JBig2_ArithIntDecoder.h",
-    "core/src/fxcodec/jbig2/JBig2_ArithQe.h",
+    "core/src/fxcodec/jbig2/JBig2_BitStream.cpp",
     "core/src/fxcodec/jbig2/JBig2_BitStream.h",
     "core/src/fxcodec/jbig2/JBig2_Context.cpp",
     "core/src/fxcodec/jbig2/JBig2_Context.h",
     "core/src/fxcodec/jbig2/JBig2_Define.h",
-    "core/src/fxcodec/jbig2/JBig2_GeneralDecoder.cpp",
-    "core/src/fxcodec/jbig2/JBig2_GeneralDecoder.h",
+    "core/src/fxcodec/jbig2/JBig2_GrdProc.cpp",
+    "core/src/fxcodec/jbig2/JBig2_GrdProc.h",
+    "core/src/fxcodec/jbig2/JBig2_GrrdProc.cpp",
+    "core/src/fxcodec/jbig2/JBig2_GrrdProc.h",
+    "core/src/fxcodec/jbig2/JBig2_GsidProc.cpp",
+    "core/src/fxcodec/jbig2/JBig2_GsidProc.h",
+    "core/src/fxcodec/jbig2/JBig2_HtrdProc.cpp",
+    "core/src/fxcodec/jbig2/JBig2_HtrdProc.h",
     "core/src/fxcodec/jbig2/JBig2_HuffmanDecoder.cpp",
     "core/src/fxcodec/jbig2/JBig2_HuffmanDecoder.h",
     "core/src/fxcodec/jbig2/JBig2_HuffmanTable.cpp",
@@ -381,128 +384,52 @@ static_library("fxcodec") {
     "core/src/fxcodec/jbig2/JBig2_Image.cpp",
     "core/src/fxcodec/jbig2/JBig2_Image.h",
     "core/src/fxcodec/jbig2/JBig2_List.h",
-    "core/src/fxcodec/jbig2/JBig2_Module.h",
-    "core/src/fxcodec/jbig2/JBig2_Object.cpp",
-    "core/src/fxcodec/jbig2/JBig2_Object.h",
     "core/src/fxcodec/jbig2/JBig2_Page.h",
     "core/src/fxcodec/jbig2/JBig2_PatternDict.cpp",
     "core/src/fxcodec/jbig2/JBig2_PatternDict.h",
+    "core/src/fxcodec/jbig2/JBig2_PddProc.cpp",
+    "core/src/fxcodec/jbig2/JBig2_PddProc.h",
+    "core/src/fxcodec/jbig2/JBig2_SddProc.cpp",
+    "core/src/fxcodec/jbig2/JBig2_SddProc.h",
     "core/src/fxcodec/jbig2/JBig2_Segment.cpp",
     "core/src/fxcodec/jbig2/JBig2_Segment.h",
     "core/src/fxcodec/jbig2/JBig2_SymbolDict.cpp",
     "core/src/fxcodec/jbig2/JBig2_SymbolDict.h",
-    "core/src/fxcodec/lcms2/src/fx_cmscam02.c",
-    "core/src/fxcodec/lcms2/src/fx_cmscgats.c",
-    "core/src/fxcodec/lcms2/src/fx_cmscnvrt.c",
-    "core/src/fxcodec/lcms2/src/fx_cmserr.c",
-    "core/src/fxcodec/lcms2/src/fx_cmsgamma.c",
-    "core/src/fxcodec/lcms2/src/fx_cmsgmt.c",
-    "core/src/fxcodec/lcms2/src/fx_cmshalf.c",
-    "core/src/fxcodec/lcms2/src/fx_cmsintrp.c",
-    "core/src/fxcodec/lcms2/src/fx_cmsio0.c",
-    "core/src/fxcodec/lcms2/src/fx_cmsio1.c",
-    "core/src/fxcodec/lcms2/src/fx_cmslut.c",
-    "core/src/fxcodec/lcms2/src/fx_cmsmd5.c",
-    "core/src/fxcodec/lcms2/src/fx_cmsmtrx.c",
-    "core/src/fxcodec/lcms2/src/fx_cmsnamed.c",
-    "core/src/fxcodec/lcms2/src/fx_cmsopt.c",
-    "core/src/fxcodec/lcms2/src/fx_cmspack.c",
-    "core/src/fxcodec/lcms2/src/fx_cmspcs.c",
-    "core/src/fxcodec/lcms2/src/fx_cmsplugin.c",
-    "core/src/fxcodec/lcms2/src/fx_cmsps2.c",
-    "core/src/fxcodec/lcms2/src/fx_cmssamp.c",
-    "core/src/fxcodec/lcms2/src/fx_cmssm.c",
-    "core/src/fxcodec/lcms2/src/fx_cmstypes.c",
-    "core/src/fxcodec/lcms2/src/fx_cmsvirt.c",
-    "core/src/fxcodec/lcms2/src/fx_cmswtpnt.c",
-    "core/src/fxcodec/lcms2/src/fx_cmsxform.c",
-    "core/src/fxcodec/libjpeg/cderror.h",
-    "core/src/fxcodec/libjpeg/cdjpeg.h",
-    "core/src/fxcodec/libjpeg/fpdfapi_jcapimin.c",
-    "core/src/fxcodec/libjpeg/fpdfapi_jcapistd.c",
-    "core/src/fxcodec/libjpeg/fpdfapi_jccoefct.c",
-    "core/src/fxcodec/libjpeg/fpdfapi_jccolor.c",
-    "core/src/fxcodec/libjpeg/fpdfapi_jcdctmgr.c",
-    "core/src/fxcodec/libjpeg/fpdfapi_jchuff.c",
-    "core/src/fxcodec/libjpeg/fpdfapi_jcinit.c",
-    "core/src/fxcodec/libjpeg/fpdfapi_jcmainct.c",
-    "core/src/fxcodec/libjpeg/fpdfapi_jcmarker.c",
-    "core/src/fxcodec/libjpeg/fpdfapi_jcmaster.c",
-    "core/src/fxcodec/libjpeg/fpdfapi_jcomapi.c",
-    "core/src/fxcodec/libjpeg/fpdfapi_jcparam.c",
-    "core/src/fxcodec/libjpeg/fpdfapi_jcphuff.c",
-    "core/src/fxcodec/libjpeg/fpdfapi_jcprepct.c",
-    "core/src/fxcodec/libjpeg/fpdfapi_jcsample.c",
-    "core/src/fxcodec/libjpeg/fpdfapi_jctrans.c",
-    "core/src/fxcodec/libjpeg/fpdfapi_jdapimin.c",
-    "core/src/fxcodec/libjpeg/fpdfapi_jdapistd.c",
-    "core/src/fxcodec/libjpeg/fpdfapi_jdcoefct.c",
-    "core/src/fxcodec/libjpeg/fpdfapi_jdcolor.c",
-    "core/src/fxcodec/libjpeg/fpdfapi_jddctmgr.c",
-    "core/src/fxcodec/libjpeg/fpdfapi_jdhuff.c",
-    "core/src/fxcodec/libjpeg/fpdfapi_jdinput.c",
-    "core/src/fxcodec/libjpeg/fpdfapi_jdmainct.c",
-    "core/src/fxcodec/libjpeg/fpdfapi_jdmarker.c",
-    "core/src/fxcodec/libjpeg/fpdfapi_jdmaster.c",
-    "core/src/fxcodec/libjpeg/fpdfapi_jdmerge.c",
-    "core/src/fxcodec/libjpeg/fpdfapi_jdphuff.c",
-    "core/src/fxcodec/libjpeg/fpdfapi_jdpostct.c",
-    "core/src/fxcodec/libjpeg/fpdfapi_jdsample.c",
-    "core/src/fxcodec/libjpeg/fpdfapi_jdtrans.c",
-    "core/src/fxcodec/libjpeg/fpdfapi_jerror.c",
-    "core/src/fxcodec/libjpeg/fpdfapi_jfdctfst.c",
-    "core/src/fxcodec/libjpeg/fpdfapi_jfdctint.c",
-    "core/src/fxcodec/libjpeg/fpdfapi_jidctfst.c",
-    "core/src/fxcodec/libjpeg/fpdfapi_jidctint.c",
-    "core/src/fxcodec/libjpeg/fpdfapi_jidctred.c",
-    "core/src/fxcodec/libjpeg/fpdfapi_jmemmgr.c",
-    "core/src/fxcodec/libjpeg/fpdfapi_jmemnobs.c",
-    "core/src/fxcodec/libjpeg/fpdfapi_jutils.c",
-    "core/src/fxcodec/libjpeg/jchuff.h",
-    "core/src/fxcodec/libjpeg/jconfig.h",
-    "core/src/fxcodec/libjpeg/jdct.h",
-    "core/src/fxcodec/libjpeg/jdhuff.h",
-    "core/src/fxcodec/libjpeg/jerror.h",
-    "core/src/fxcodec/libjpeg/jinclude.h",
-    "core/src/fxcodec/libjpeg/jmemsys.h",
-    "core/src/fxcodec/libjpeg/jmorecfg.h",
-    "core/src/fxcodec/libjpeg/jpegint.h",
-    "core/src/fxcodec/libjpeg/jpeglib.h",
-    "core/src/fxcodec/libjpeg/jversion.h",
-    "core/src/fxcodec/libjpeg/makefile",
-    "core/src/fxcodec/libjpeg/transupp.h",
+    "core/src/fxcodec/jbig2/JBig2_TrdProc.cpp",
+    "core/src/fxcodec/jbig2/JBig2_TrdProc.h",
   ]
-  configs -= [ "//build/config/compiler:chromium_code" ]
 
   if (is_posix) {
     # core/src/fxcodec/fx_libopenjpeg/src/fx_mct.c does an pointer-to-int
     # conversion to check that an address is 16-bit aligned (benign).
     cflags_c = [ "-Wno-pointer-to-int-cast" ]
   }
-  configs += [ ":pdfium_config", "//build/config/compiler:no_chromium_code" ]
+  configs += [ ":pdfium_config" ]
+}
+
+config("fxge_warnings") {
+  if (is_clang) {
+    cflags = [
+      # http://code.google.com/p/pdfium/issues/detail?id=188
+      "-Wno-switch",
+    ]
+  }
 }
 
 static_library("fxcrt") {
   sources = [
-    "core/include/fxcrt/fx_arb.h",
     "core/include/fxcrt/fx_basic.h",
+    "core/include/fxcrt/fx_bidi.h",
     "core/include/fxcrt/fx_coordinates.h",
     "core/include/fxcrt/fx_ext.h",
     "core/include/fxcrt/fx_memory.h",
+    "core/include/fxcrt/fx_safe_types.h",
     "core/include/fxcrt/fx_stream.h",
     "core/include/fxcrt/fx_string.h",
     "core/include/fxcrt/fx_system.h",
     "core/include/fxcrt/fx_ucd.h",
     "core/include/fxcrt/fx_xml.h",
     "core/src/fxcrt/extension.h",
-    "core/src/fxcrt/fxcrt_platforms.cpp",
-    "core/src/fxcrt/fxcrt_platforms.h",
-    "core/src/fxcrt/fxcrt_posix.cpp",
-    "core/src/fxcrt/fxcrt_posix.h",
-    "core/src/fxcrt/fxcrt_windows.cpp",
-    "core/src/fxcrt/fxcrt_windows.h",
-    "core/src/fxcrt/fx_arabic.cpp",
-    "core/src/fxcrt/fx_arabic.h",
     "core/src/fxcrt/fx_basic_array.cpp",
     "core/src/fxcrt/fx_basic_bstring.cpp",
     "core/src/fxcrt/fx_basic_buffer.cpp",
@@ -515,19 +442,28 @@ static_library("fxcrt") {
     "core/src/fxcrt/fx_basic_utf.cpp",
     "core/src/fxcrt/fx_basic_util.cpp",
     "core/src/fxcrt/fx_basic_wstring.cpp",
+    "core/src/fxcrt/fx_bidi.cpp",
     "core/src/fxcrt/fx_extension.cpp",
     "core/src/fxcrt/fx_ucddata.cpp",
     "core/src/fxcrt/fx_unicode.cpp",
     "core/src/fxcrt/fx_xml_composer.cpp",
     "core/src/fxcrt/fx_xml_parser.cpp",
+    "core/src/fxcrt/fxcrt_platforms.cpp",
+    "core/src/fxcrt/fxcrt_platforms.h",
+    "core/src/fxcrt/fxcrt_posix.cpp",
+    "core/src/fxcrt/fxcrt_posix.h",
+    "core/src/fxcrt/fxcrt_windows.cpp",
+    "core/src/fxcrt/fxcrt_windows.h",
     "core/src/fxcrt/plex.h",
     "core/src/fxcrt/xml_int.h",
   ]
-  configs -= [ "//build/config/compiler:chromium_code" ]
-  configs += [ ":pdfium_config", "//build/config/compiler:no_chromium_code" ]
+  configs += [ ":pdfium_config" ]
 }
 
 static_library("fxge") {
+  deps = [
+    "third_party:fx_agg",
+  ]
   sources = [
     "core/include/fxge/fpf.h",
     "core/include/fxge/fx_dib.h",
@@ -536,23 +472,8 @@ static_library("fxge") {
     "core/include/fxge/fx_ge.h",
     "core/include/fxge/fx_ge_apple.h",
     "core/include/fxge/fx_ge_win32.h",
-    "core/src/fxge/agg/include/fxfx_agg_basics.h",
-    "core/src/fxge/agg/include/fxfx_agg_clip_liang_barsky.h",
-    "core/src/fxge/agg/include/fxfx_agg_conv_dash.h",
-    "core/src/fxge/agg/include/fxfx_agg_conv_stroke.h",
-    "core/src/fxge/agg/include/fxfx_agg_curves.h",
-    "core/src/fxge/agg/include/fxfx_agg_path_storage.h",
-    "core/src/fxge/agg/include/fxfx_agg_rasterizer_scanline_aa.h",
-    "core/src/fxge/agg/include/fxfx_agg_renderer_scanline.h",
-    "core/src/fxge/agg/include/fxfx_agg_rendering_buffer.h",
-    "core/src/fxge/agg/include/fxfx_agg_scanline_u.h",
     "core/src/fxge/agg/include/fx_agg_driver.h",
-    "core/src/fxge/agg/src/fxfx_agg_curves.cpp",
-    "core/src/fxge/agg/src/fxfx_agg_driver.cpp",
-    "core/src/fxge/agg/src/fxfx_agg_path_storage.cpp",
-    "core/src/fxge/agg/src/fxfx_agg_rasterizer_scanline_aa.cpp",
-    "core/src/fxge/agg/src/fxfx_agg_vcgen_dash.cpp",
-    "core/src/fxge/agg/src/fxfx_agg_vcgen_stroke.cpp",
+    "core/src/fxge/agg/src/fx_agg_driver.cpp",
     "core/src/fxge/android/fpf_skiafont.cpp",
     "core/src/fxge/android/fpf_skiafont.h",
     "core/src/fxge/android/fpf_skiafontmgr.cpp",
@@ -573,6 +494,7 @@ static_library("fxge") {
     "core/src/fxge/dib/fx_dib_engine.cpp",
     "core/src/fxge/dib/fx_dib_main.cpp",
     "core/src/fxge/dib/fx_dib_transform.cpp",
+    "core/src/fxge/fontdata/chromefontdata/chromefontdata.h",
     "core/src/fxge/fontdata/chromefontdata/FoxitDingbats.c",
     "core/src/fxge/fontdata/chromefontdata/FoxitFixed.c",
     "core/src/fxge/fontdata/chromefontdata/FoxitFixedBold.c",
@@ -601,8 +523,10 @@ static_library("fxge") {
     "core/src/fxge/ge/text_int.h",
   ]
 
-  configs -= [ "//build/config/compiler:chromium_code" ]
-  configs += [ ":pdfium_config", "//build/config/compiler:no_chromium_code" ]
+  configs += [
+    ":fxge_warnings",
+    ":pdfium_config",
+  ]
 
   if (pdf_use_skia) {
     sources = [
@@ -632,9 +556,7 @@ static_library("fxge") {
       "core/src/fxge/win32/fx_win32_print.cpp",
       "core/src/fxge/win32/win32_int.h",
     ]
-    configs -= [
-      "//build/config/win:lean_and_mean",
-    ]
+    configs -= [ "//build/config/win:lean_and_mean" ]
   }
 }
 
@@ -650,8 +572,7 @@ static_library("fxedit") {
     "fpdfsdk/src/fxedit/fxet_module.cpp",
     "fpdfsdk/src/fxedit/fxet_pageobjs.cpp",
   ]
-  configs -= [ "//build/config/compiler:chromium_code" ]
-  configs += [ ":pdfium_config", "//build/config/compiler:no_chromium_code" ]
+  configs += [ ":pdfium_config" ]
 }
 
 static_library("pdfwindow") {
@@ -693,87 +614,68 @@ static_library("pdfwindow") {
     "fpdfsdk/src/pdfwindow/PWL_Utils.cpp",
     "fpdfsdk/src/pdfwindow/PWL_Wnd.cpp",
   ]
-  configs -= [ "//build/config/compiler:chromium_code" ]
-  configs += [ ":pdfium_config", "//build/config/compiler:no_chromium_code" ]
+  configs += [ ":pdfium_config" ]
 }
 
 static_library("javascript") {
   sources = [
-    "fpdfsdk/include/javascript/app.h",
-    "fpdfsdk/include/javascript/color.h",
-    "fpdfsdk/include/javascript/console.h",
-    "fpdfsdk/include/javascript/Consts.h",
-    "fpdfsdk/include/javascript/Document.h",
-    "fpdfsdk/include/javascript/event.h",
-    "fpdfsdk/include/javascript/Field.h",
-    "fpdfsdk/include/javascript/global.h",
-    "fpdfsdk/include/javascript/Icon.h",
     "fpdfsdk/include/javascript/IJavaScript.h",
-    "fpdfsdk/include/javascript/JavaScript.h",
-    "fpdfsdk/include/javascript/JS_Console.h",
-    "fpdfsdk/include/javascript/JS_Context.h",
-    "fpdfsdk/include/javascript/JS_Define.h",
-    "fpdfsdk/include/javascript/JS_EventHandler.h",
-    "fpdfsdk/include/javascript/JS_GlobalData.h",
-    "fpdfsdk/include/javascript/JS_Module.h",
-    "fpdfsdk/include/javascript/JS_Object.h",
-    "fpdfsdk/include/javascript/JS_Runtime.h",
-    "fpdfsdk/include/javascript/JS_Value.h",
-    "fpdfsdk/include/javascript/PublicMethods.h",
-    "fpdfsdk/include/javascript/report.h",
-    "fpdfsdk/include/javascript/resource.h",
-    "fpdfsdk/include/javascript/util.h",
-    "fpdfsdk/src/javascript/app.cpp",
-    "fpdfsdk/src/javascript/color.cpp",
-    "fpdfsdk/src/javascript/console.cpp",
-    "fpdfsdk/src/javascript/Consts.cpp",
-    "fpdfsdk/src/javascript/Document.cpp",
-    "fpdfsdk/src/javascript/event.cpp",
-    "fpdfsdk/src/javascript/Field.cpp",
-    "fpdfsdk/src/javascript/global.cpp",
-    "fpdfsdk/src/javascript/Icon.cpp",
-    "fpdfsdk/src/javascript/JS_Context.cpp",
-    "fpdfsdk/src/javascript/JS_EventHandler.cpp",
-    "fpdfsdk/src/javascript/JS_GlobalData.cpp",
-    "fpdfsdk/src/javascript/JS_Object.cpp",
-    "fpdfsdk/src/javascript/JS_Runtime.cpp",
-    "fpdfsdk/src/javascript/JS_Value.cpp",
-    "fpdfsdk/src/javascript/PublicMethods.cpp",
-    "fpdfsdk/src/javascript/report.cpp",
-    "fpdfsdk/src/javascript/util.cpp",
-  ]
-
-  configs -= [ "//build/config/compiler:chromium_code" ]
-  configs += [ ":pdfium_config", "//build/config/compiler:no_chromium_code" ]
-  include_dirs = [
-    "//v8",
-    "//v8/include",
-  ]
-
-  public_deps = [
-    "//v8",
-  ]
-  deps = [
-    "//v8:v8_libplatform",
-  ]
-}
-
-static_library("jsapi") {
-  sources = [
-    "fpdfsdk/include/jsapi/fxjs_v8.h",
-    "fpdfsdk/src/jsapi/fxjs_v8.cpp",
-  ]
-
-  configs -= [ "//build/config/compiler:chromium_code" ]
-  configs += [ ":pdfium_config", "//build/config/compiler:no_chromium_code" ]
-  include_dirs = [
-    "//v8",
-    "//v8/include",
-  ]
-
-  public_deps = [
-    "//v8",
   ]
+  if (pdf_enable_v8) {
+    sources += [
+      "fpdfsdk/src/javascript/Consts.cpp",
+      "fpdfsdk/src/javascript/Consts.h",
+      "fpdfsdk/src/javascript/Document.cpp",
+      "fpdfsdk/src/javascript/Document.h",
+      "fpdfsdk/src/javascript/Field.cpp",
+      "fpdfsdk/src/javascript/Field.h",
+      "fpdfsdk/src/javascript/Icon.cpp",
+      "fpdfsdk/src/javascript/Icon.h",
+      "fpdfsdk/src/javascript/JS_Context.cpp",
+      "fpdfsdk/src/javascript/JS_Context.h",
+      "fpdfsdk/src/javascript/JS_Define.h",
+      "fpdfsdk/src/javascript/JS_EventHandler.cpp",
+      "fpdfsdk/src/javascript/JS_EventHandler.h",
+      "fpdfsdk/src/javascript/JS_GlobalData.cpp",
+      "fpdfsdk/src/javascript/JS_GlobalData.h",
+      "fpdfsdk/src/javascript/JS_Object.cpp",
+      "fpdfsdk/src/javascript/JS_Object.h",
+      "fpdfsdk/src/javascript/JS_Runtime.cpp",
+      "fpdfsdk/src/javascript/JS_Runtime.h",
+      "fpdfsdk/src/javascript/JS_Value.cpp",
+      "fpdfsdk/src/javascript/JS_Value.h",
+      "fpdfsdk/src/javascript/PublicMethods.cpp",
+      "fpdfsdk/src/javascript/PublicMethods.h",
+      "fpdfsdk/src/javascript/app.cpp",
+      "fpdfsdk/src/javascript/app.h",
+      "fpdfsdk/src/javascript/color.cpp",
+      "fpdfsdk/src/javascript/color.h",
+      "fpdfsdk/src/javascript/console.cpp",
+      "fpdfsdk/src/javascript/console.h",
+      "fpdfsdk/src/javascript/event.cpp",
+      "fpdfsdk/src/javascript/event.h",
+      "fpdfsdk/src/javascript/global.cpp",
+      "fpdfsdk/src/javascript/global.h",
+      "fpdfsdk/src/javascript/report.cpp",
+      "fpdfsdk/src/javascript/report.h",
+      "fpdfsdk/src/javascript/resource.cpp",
+      "fpdfsdk/src/javascript/resource.h",
+      "fpdfsdk/src/javascript/util.cpp",
+      "fpdfsdk/src/javascript/util.h",
+      "fpdfsdk/include/jsapi/fxjs_v8.h",
+      "fpdfsdk/src/jsapi/fxjs_v8.cpp",
+    ]
+    include_dirs = [
+      "//v8",
+      "//v8/include",
+    ]
+    public_deps = [
+      "//v8",
+    ]
+  } else {
+    sources += [ "fpdfsdk/src/javascript/JS_Runtime_Stub.cpp" ]
+  }
+  configs += [ ":pdfium_config" ]
 }
 
 static_library("formfiller") {
@@ -784,11 +686,9 @@ static_library("formfiller") {
     "fpdfsdk/include/formfiller/FFL_FormFiller.h",
     "fpdfsdk/include/formfiller/FFL_IFormFiller.h",
     "fpdfsdk/include/formfiller/FFL_ListBox.h",
-    "fpdfsdk/include/formfiller/FFL_Notify.h",
     "fpdfsdk/include/formfiller/FFL_PushButton.h",
     "fpdfsdk/include/formfiller/FFL_RadioButton.h",
     "fpdfsdk/include/formfiller/FFL_TextField.h",
-    "fpdfsdk/include/formfiller/FFL_Utils.h",
     "fpdfsdk/include/formfiller/FormFiller.h",
     "fpdfsdk/src/formfiller/FFL_CBA_Fontmap.cpp",
     "fpdfsdk/src/formfiller/FFL_CheckBox.cpp",
@@ -796,49 +696,71 @@ static_library("formfiller") {
     "fpdfsdk/src/formfiller/FFL_FormFiller.cpp",
     "fpdfsdk/src/formfiller/FFL_IFormFiller.cpp",
     "fpdfsdk/src/formfiller/FFL_ListBox.cpp",
-    "fpdfsdk/src/formfiller/FFL_Notify.cpp",
     "fpdfsdk/src/formfiller/FFL_PushButton.cpp",
     "fpdfsdk/src/formfiller/FFL_RadioButton.cpp",
     "fpdfsdk/src/formfiller/FFL_TextField.cpp",
-    "fpdfsdk/src/formfiller/FFL_Utils.cpp",
   ]
-  configs -= [ "//build/config/compiler:chromium_code" ]
-  configs += [ ":pdfium_config", "//build/config/compiler:no_chromium_code" ]
+  configs += [ ":pdfium_config" ]
 }
 
 test("pdfium_unittests") {
   sources = [
+    "core/src/fxcodec/codec/fx_codec_jpx_unittest.cpp",
     "core/src/fxcrt/fx_basic_bstring_unittest.cpp",
+    "core/src/fxcrt/fx_basic_memmgr_unittest.cpp",
     "core/src/fxcrt/fx_basic_wstring_unittest.cpp",
-    "testing/fx_string_testhelpers.cpp",
-    "testing/fx_string_testhelpers.h",
+    "core/src/fxcrt/fx_bidi_unittest.cpp",
+    "core/src/fxcrt/fx_system_unittest.cpp",
+    "third_party/base/nonstd_unique_ptr_unittest.cpp",
   ]
   deps = [
     "//testing/gtest",
     "//testing/gtest:gtest_main",
-    ":pdfium"
+    ":pdfium",
+    ":test_support",
   ]
   include_dirs = [ "." ]
-  configs -= [ "//build/config/compiler:chromium_code" ]
-  configs += [ ":pdfium_config", "//build/config/compiler:no_chromium_code" ]
+  configs += [ ":pdfium_config" ]
 }
 
 test("pdfium_embeddertests") {
   sources = [
+    "core/src/fpdfapi/fpdf_parser/fpdf_parser_decode_embeddertest.cpp",
+    "core/src/fpdfapi/fpdf_parser/fpdf_parser_parser_embeddertest.cpp",
+    "core/src/fpdfapi/fpdf_render/fpdf_render_pattern_embeddertest.cpp",
     "fpdfsdk/src/fpdf_dataavail_embeddertest.cpp",
     "fpdfsdk/src/fpdfdoc_embeddertest.cpp",
+    "fpdfsdk/src/fpdfformfill_embeddertest.cpp",
     "fpdfsdk/src/fpdftext_embeddertest.cpp",
+    "fpdfsdk/src/fpdfview_c_api_test.c",
+    "fpdfsdk/src/fpdfview_c_api_test.h",
     "fpdfsdk/src/fpdfview_embeddertest.cpp",
     "testing/embedder_test.cpp",
     "testing/embedder_test.h",
-    "testing/fx_string_testhelpers.cpp",
-    "testing/fx_string_testhelpers.h",
+    "testing/embedder_test_mock_delegate.h",
+    "testing/embedder_test_timer_handling_delegate.h",
   ]
   deps = [
+    "//testing/gmock",
     "//testing/gtest",
-    ":pdfium"
+    ":pdfium",
+    ":test_support",
   ]
-  include_dirs = [ "." ]
-  configs -= [ "//build/config/compiler:chromium_code" ]
-  configs += [ ":pdfium_config", "//build/config/compiler:no_chromium_code" ]
+  include_dirs = [
+    "."
+  ]
+  if (pdf_enable_v8) {
+    sources += [
+     "fpdfsdk/src/jsapi/fxjs_v8_embeddertest.cpp"
+    ]
+    deps += [
+      "//v8",
+      "//v8:v8_libplatform",
+    ]
+    include_dirs += [
+      "//v8",
+      "//v8/include",
+    ]
+  }
+  configs += [ ":pdfium_config" ]
 }