Move core/src/ up to core/.

BUILD.gn

 # Copyright 2016 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build_overrides/v8.gni")
 import("//testing/test.gni")
 import("pdfium.gni")
 
 config("pdfium_config") {
   cflags = []
@@ skipping 180 matching lines @@
 
 # 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 = [
+    "core/fdrm/crypto/fx_crypt.cpp",
+    "core/fdrm/crypto/fx_crypt_aes.cpp",
+    "core/fdrm/crypto/fx_crypt_sha.cpp",
     "core/include/fdrm/fx_crypt.h",
-    "core/src/fdrm/crypto/fx_crypt.cpp",
-    "core/src/fdrm/crypto/fx_crypt_aes.cpp",
-    "core/src/fdrm/crypto/fx_crypt_sha.cpp",
   ]
   configs += [ ":pdfium_config" ]
 }
 
 static_library("fpdfdoc") {
   sources = [
+    "core/fpdfdoc/doc_action.cpp",
+    "core/fpdfdoc/doc_annot.cpp",
+    "core/fpdfdoc/doc_ap.cpp",
+    "core/fpdfdoc/doc_basic.cpp",
+    "core/fpdfdoc/doc_bookmark.cpp",
+    "core/fpdfdoc/doc_form.cpp",
+    "core/fpdfdoc/doc_formcontrol.cpp",
+    "core/fpdfdoc/doc_formfield.cpp",
+    "core/fpdfdoc/doc_link.cpp",
+    "core/fpdfdoc/doc_metadata.cpp",
+    "core/fpdfdoc/doc_ocg.cpp",
+    "core/fpdfdoc/doc_tagged.cpp",
+    "core/fpdfdoc/doc_utils.cpp",
+    "core/fpdfdoc/doc_utils.h",
+    "core/fpdfdoc/doc_viewerPreferences.cpp",
+    "core/fpdfdoc/doc_vt.cpp",
+    "core/fpdfdoc/doc_vtmodule.cpp",
+    "core/fpdfdoc/pdf_vt.h",
+    "core/fpdfdoc/tagged_int.h",
     "core/include/fpdfdoc/fpdf_ap.h",
     "core/include/fpdfdoc/fpdf_doc.h",
     "core/include/fpdfdoc/fpdf_tagged.h",
     "core/include/fpdfdoc/fpdf_vt.h",
-    "core/src/fpdfdoc/doc_action.cpp",
-    "core/src/fpdfdoc/doc_annot.cpp",
-    "core/src/fpdfdoc/doc_ap.cpp",
-    "core/src/fpdfdoc/doc_basic.cpp",
-    "core/src/fpdfdoc/doc_bookmark.cpp",
-    "core/src/fpdfdoc/doc_form.cpp",
-    "core/src/fpdfdoc/doc_formcontrol.cpp",
-    "core/src/fpdfdoc/doc_formfield.cpp",
-    "core/src/fpdfdoc/doc_link.cpp",
-    "core/src/fpdfdoc/doc_metadata.cpp",
-    "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 += [ ":pdfium_config" ]
 }
 
 static_library("fpdfapi") {
   sources = [
+    "core/fpdfapi/fpdf_basic_module.cpp",
+    "core/fpdfapi/fpdf_cmaps/CNS1/Adobe-CNS1-UCS2_5.cpp",
+    "core/fpdfapi/fpdf_cmaps/CNS1/B5pc-H_0.cpp",
+    "core/fpdfapi/fpdf_cmaps/CNS1/B5pc-V_0.cpp",
+    "core/fpdfapi/fpdf_cmaps/CNS1/CNS-EUC-H_0.cpp",
+    "core/fpdfapi/fpdf_cmaps/CNS1/CNS-EUC-V_0.cpp",
+    "core/fpdfapi/fpdf_cmaps/CNS1/ETen-B5-H_0.cpp",
+    "core/fpdfapi/fpdf_cmaps/CNS1/ETen-B5-V_0.cpp",
+    "core/fpdfapi/fpdf_cmaps/CNS1/ETenms-B5-H_0.cpp",
+    "core/fpdfapi/fpdf_cmaps/CNS1/ETenms-B5-V_0.cpp",
+    "core/fpdfapi/fpdf_cmaps/CNS1/HKscs-B5-H_5.cpp",
+    "core/fpdfapi/fpdf_cmaps/CNS1/HKscs-B5-V_5.cpp",
+    "core/fpdfapi/fpdf_cmaps/CNS1/UniCNS-UCS2-H_3.cpp",
+    "core/fpdfapi/fpdf_cmaps/CNS1/UniCNS-UCS2-V_3.cpp",
+    "core/fpdfapi/fpdf_cmaps/CNS1/UniCNS-UTF16-H_0.cpp",
+    "core/fpdfapi/fpdf_cmaps/CNS1/cmaps_cns1.cpp",
+    "core/fpdfapi/fpdf_cmaps/GB1/Adobe-GB1-UCS2_5.cpp",
+    "core/fpdfapi/fpdf_cmaps/GB1/GB-EUC-H_0.cpp",
+    "core/fpdfapi/fpdf_cmaps/GB1/GB-EUC-V_0.cpp",
+    "core/fpdfapi/fpdf_cmaps/GB1/GBK-EUC-H_2.cpp",
+    "core/fpdfapi/fpdf_cmaps/GB1/GBK-EUC-V_2.cpp",
+    "core/fpdfapi/fpdf_cmaps/GB1/GBK2K-H_5.cpp",
+    "core/fpdfapi/fpdf_cmaps/GB1/GBK2K-V_5.cpp",
+    "core/fpdfapi/fpdf_cmaps/GB1/GBKp-EUC-H_2.cpp",
+    "core/fpdfapi/fpdf_cmaps/GB1/GBKp-EUC-V_2.cpp",
+    "core/fpdfapi/fpdf_cmaps/GB1/GBpc-EUC-H_0.cpp",
+    "core/fpdfapi/fpdf_cmaps/GB1/GBpc-EUC-V_0.cpp",
+    "core/fpdfapi/fpdf_cmaps/GB1/UniGB-UCS2-H_4.cpp",
+    "core/fpdfapi/fpdf_cmaps/GB1/UniGB-UCS2-V_4.cpp",
+    "core/fpdfapi/fpdf_cmaps/GB1/cmaps_gb1.cpp",
+    "core/fpdfapi/fpdf_cmaps/Japan1/83pv-RKSJ-H_1.cpp",
+    "core/fpdfapi/fpdf_cmaps/Japan1/90ms-RKSJ-H_2.cpp",
+    "core/fpdfapi/fpdf_cmaps/Japan1/90ms-RKSJ-V_2.cpp",
+    "core/fpdfapi/fpdf_cmaps/Japan1/90msp-RKSJ-H_2.cpp",
+    "core/fpdfapi/fpdf_cmaps/Japan1/90msp-RKSJ-V_2.cpp",
+    "core/fpdfapi/fpdf_cmaps/Japan1/90pv-RKSJ-H_1.cpp",
+    "core/fpdfapi/fpdf_cmaps/Japan1/Add-RKSJ-H_1.cpp",
+    "core/fpdfapi/fpdf_cmaps/Japan1/Add-RKSJ-V_1.cpp",
+    "core/fpdfapi/fpdf_cmaps/Japan1/Adobe-Japan1-UCS2_4.cpp",
+    "core/fpdfapi/fpdf_cmaps/Japan1/EUC-H_1.cpp",
+    "core/fpdfapi/fpdf_cmaps/Japan1/EUC-V_1.cpp",
+    "core/fpdfapi/fpdf_cmaps/Japan1/Ext-RKSJ-H_2.cpp",
+    "core/fpdfapi/fpdf_cmaps/Japan1/Ext-RKSJ-V_2.cpp",
+    "core/fpdfapi/fpdf_cmaps/Japan1/H_1.cpp",
+    "core/fpdfapi/fpdf_cmaps/Japan1/UniJIS-UCS2-HW-H_4.cpp",
+    "core/fpdfapi/fpdf_cmaps/Japan1/UniJIS-UCS2-HW-V_4.cpp",
+    "core/fpdfapi/fpdf_cmaps/Japan1/UniJIS-UCS2-H_4.cpp",
+    "core/fpdfapi/fpdf_cmaps/Japan1/UniJIS-UCS2-V_4.cpp",
+    "core/fpdfapi/fpdf_cmaps/Japan1/V_1.cpp",
+    "core/fpdfapi/fpdf_cmaps/Japan1/cmaps_japan1.cpp",
+    "core/fpdfapi/fpdf_cmaps/Korea1/Adobe-Korea1-UCS2_2.cpp",
+    "core/fpdfapi/fpdf_cmaps/Korea1/KSC-EUC-H_0.cpp",
+    "core/fpdfapi/fpdf_cmaps/Korea1/KSC-EUC-V_0.cpp",
+    "core/fpdfapi/fpdf_cmaps/Korea1/KSCms-UHC-HW-H_1.cpp",
+    "core/fpdfapi/fpdf_cmaps/Korea1/KSCms-UHC-HW-V_1.cpp",
+    "core/fpdfapi/fpdf_cmaps/Korea1/KSCms-UHC-H_1.cpp",
+    "core/fpdfapi/fpdf_cmaps/Korea1/KSCms-UHC-V_1.cpp",
+    "core/fpdfapi/fpdf_cmaps/Korea1/KSCpc-EUC-H_0.cpp",
+    "core/fpdfapi/fpdf_cmaps/Korea1/UniKS-UCS2-H_1.cpp",
+    "core/fpdfapi/fpdf_cmaps/Korea1/UniKS-UCS2-V_1.cpp",
+    "core/fpdfapi/fpdf_cmaps/Korea1/UniKS-UTF16-H_0.cpp",
+    "core/fpdfapi/fpdf_cmaps/Korea1/cmaps_korea1.cpp",
+    "core/fpdfapi/fpdf_cmaps/cmap_int.h",
+    "core/fpdfapi/fpdf_cmaps/fpdf_cmaps.cpp",
+    "core/fpdfapi/fpdf_edit/editint.h",
+    "core/fpdfapi/fpdf_edit/fpdf_edit_content.cpp",
+    "core/fpdfapi/fpdf_edit/fpdf_edit_create.cpp",
+    "core/fpdfapi/fpdf_edit/fpdf_edit_doc.cpp",
+    "core/fpdfapi/fpdf_edit/fpdf_edit_image.cpp",
+    "core/fpdfapi/fpdf_font/font_int.h",
+    "core/fpdfapi/fpdf_font/fpdf_font.cpp",
+    "core/fpdfapi/fpdf_font/fpdf_font_charset.cpp",
+    "core/fpdfapi/fpdf_font/fpdf_font_cid.cpp",
+    "core/fpdfapi/fpdf_font/ttgsubtable.cpp",
+    "core/fpdfapi/fpdf_font/ttgsubtable.h",
+    "core/fpdfapi/fpdf_page/fpdf_page.cpp",
+    "core/fpdfapi/fpdf_page/fpdf_page_colors.cpp",
+    "core/fpdfapi/fpdf_page/fpdf_page_doc.cpp",
+    "core/fpdfapi/fpdf_page/fpdf_page_func.cpp",
+    "core/fpdfapi/fpdf_page/fpdf_page_graph_state.cpp",
+    "core/fpdfapi/fpdf_page/fpdf_page_image.cpp",
+    "core/fpdfapi/fpdf_page/fpdf_page_parser.cpp",
+    "core/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp",
+    "core/fpdfapi/fpdf_page/fpdf_page_path.cpp",
+    "core/fpdfapi/fpdf_page/fpdf_page_pattern.cpp",
+    "core/fpdfapi/fpdf_page/pageint.h",
+    "core/fpdfapi/fpdf_parser/cfdf_document.cpp",
+    "core/fpdfapi/fpdf_parser/cpdf_array.cpp",
+    "core/fpdfapi/fpdf_parser/cpdf_boolean.cpp",
+    "core/fpdfapi/fpdf_parser/cpdf_data_avail.cpp",
+    "core/fpdfapi/fpdf_parser/cpdf_data_avail.h",
+    "core/fpdfapi/fpdf_parser/cpdf_dictionary.cpp",
+    "core/fpdfapi/fpdf_parser/cpdf_document.cpp",
+    "core/fpdfapi/fpdf_parser/cpdf_hint_tables.cpp",
+    "core/fpdfapi/fpdf_parser/cpdf_hint_tables.h",
+    "core/fpdfapi/fpdf_parser/cpdf_indirect_object_holder.cpp",
+    "core/fpdfapi/fpdf_parser/cpdf_name.cpp",
+    "core/fpdfapi/fpdf_parser/cpdf_null.cpp",
+    "core/fpdfapi/fpdf_parser/cpdf_number.cpp",
+    "core/fpdfapi/fpdf_parser/cpdf_object.cpp",
+    "core/fpdfapi/fpdf_parser/cpdf_parser.cpp",
+    "core/fpdfapi/fpdf_parser/cpdf_reference.cpp",
+    "core/fpdfapi/fpdf_parser/cpdf_simple_parser.cpp",
+    "core/fpdfapi/fpdf_parser/cpdf_standard_crypto_handler.cpp",
+    "core/fpdfapi/fpdf_parser/cpdf_standard_crypto_handler.h",
+    "core/fpdfapi/fpdf_parser/cpdf_standard_security_handler.cpp",
+    "core/fpdfapi/fpdf_parser/cpdf_standard_security_handler.h",
+    "core/fpdfapi/fpdf_parser/cpdf_stream.cpp",
+    "core/fpdfapi/fpdf_parser/cpdf_string.cpp",
+    "core/fpdfapi/fpdf_parser/cpdf_syntax_parser.cpp",
+    "core/fpdfapi/fpdf_parser/cpdf_syntax_parser.h",
+    "core/fpdfapi/fpdf_parser/fpdf_parser_decode.cpp",
+    "core/fpdfapi/fpdf_parser/fpdf_parser_utility.cpp",
+    "core/fpdfapi/fpdf_parser/fpdf_parser_utility.h",
+    "core/fpdfapi/fpdf_render/fpdf_render.cpp",
+    "core/fpdfapi/fpdf_render/fpdf_render_cache.cpp",
+    "core/fpdfapi/fpdf_render/fpdf_render_image.cpp",
+    "core/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp",
+    "core/fpdfapi/fpdf_render/fpdf_render_pattern.cpp",
+    "core/fpdfapi/fpdf_render/fpdf_render_text.cpp",
+    "core/fpdfapi/fpdf_render/render_int.h",
     "core/include/fpdfapi/cfdf_document.h",
     "core/include/fpdfapi/cpdf_array.h",
     "core/include/fpdfapi/cpdf_boolean.h",
     "core/include/fpdfapi/cpdf_dictionary.h",
     "core/include/fpdfapi/cpdf_document.h",
     "core/include/fpdfapi/cpdf_indirect_object_holder.h",
     "core/include/fpdfapi/cpdf_name.h",
     "core/include/fpdfapi/cpdf_null.h",
     "core/include/fpdfapi/cpdf_number.h",
     "core/include/fpdfapi/cpdf_object.h",
     "core/include/fpdfapi/cpdf_parser.h",
     "core/include/fpdfapi/cpdf_reference.h",
     "core/include/fpdfapi/cpdf_simple_parser.h",
     "core/include/fpdfapi/cpdf_stream.h",
     "core/include/fpdfapi/cpdf_string.h",
     "core/include/fpdfapi/fpdf_module.h",
     "core/include/fpdfapi/fpdf_page.h",
     "core/include/fpdfapi/fpdf_pageobj.h",
     "core/include/fpdfapi/fpdf_parser_decode.h",
     "core/include/fpdfapi/fpdf_render.h",
     "core/include/fpdfapi/fpdf_resource.h",
     "core/include/fpdfapi/fpdf_serial.h",
     "core/include/fpdfapi/ipdf_crypto_handler.h",
     "core/include/fpdfapi/ipdf_data_avail.h",
     "core/include/fpdfapi/ipdf_security_handler.h",
-    "core/src/fpdfapi/fpdf_basic_module.cpp",
-    "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/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",
-    "core/src/fpdfapi/fpdf_cmaps/CNS1/ETen-B5-V_0.cpp",
-    "core/src/fpdfapi/fpdf_cmaps/CNS1/ETenms-B5-H_0.cpp",
-    "core/src/fpdfapi/fpdf_cmaps/CNS1/ETenms-B5-V_0.cpp",
-    "core/src/fpdfapi/fpdf_cmaps/CNS1/HKscs-B5-H_5.cpp",
-    "core/src/fpdfapi/fpdf_cmaps/CNS1/HKscs-B5-V_5.cpp",
-    "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/CNS1/cmaps_cns1.cpp",
-    "core/src/fpdfapi/fpdf_cmaps/GB1/Adobe-GB1-UCS2_5.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",
-    "core/src/fpdfapi/fpdf_cmaps/GB1/GBK-EUC-V_2.cpp",
-    "core/src/fpdfapi/fpdf_cmaps/GB1/GBK2K-H_5.cpp",
-    "core/src/fpdfapi/fpdf_cmaps/GB1/GBK2K-V_5.cpp",
-    "core/src/fpdfapi/fpdf_cmaps/GB1/GBKp-EUC-H_2.cpp",
-    "core/src/fpdfapi/fpdf_cmaps/GB1/GBKp-EUC-V_2.cpp",
-    "core/src/fpdfapi/fpdf_cmaps/GB1/GBpc-EUC-H_0.cpp",
-    "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",
-    "core/src/fpdfapi/fpdf_cmaps/Japan1/90msp-RKSJ-H_2.cpp",
-    "core/src/fpdfapi/fpdf_cmaps/Japan1/90msp-RKSJ-V_2.cpp",
-    "core/src/fpdfapi/fpdf_cmaps/Japan1/90pv-RKSJ-H_1.cpp",
-    "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/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",
-    "core/src/fpdfapi/fpdf_cmaps/Japan1/Ext-RKSJ-V_2.cpp",
-    "core/src/fpdfapi/fpdf_cmaps/Japan1/H_1.cpp",
-    "core/src/fpdfapi/fpdf_cmaps/Japan1/UniJIS-UCS2-HW-H_4.cpp",
-    "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/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/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",
-    "core/src/fpdfapi/fpdf_cmaps/Korea1/KSCms-UHC-HW-V_1.cpp",
-    "core/src/fpdfapi/fpdf_cmaps/Korea1/KSCms-UHC-H_1.cpp",
-    "core/src/fpdfapi/fpdf_cmaps/Korea1/KSCms-UHC-V_1.cpp",
-    "core/src/fpdfapi/fpdf_cmaps/Korea1/KSCpc-EUC-H_0.cpp",
-    "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",
-    "core/src/fpdfapi/fpdf_edit/fpdf_edit_doc.cpp",
-    "core/src/fpdfapi/fpdf_edit/fpdf_edit_image.cpp",
-    "core/src/fpdfapi/fpdf_font/font_int.h",
-    "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/ttgsubtable.cpp",
-    "core/src/fpdfapi/fpdf_font/ttgsubtable.h",
-    "core/src/fpdfapi/fpdf_page/fpdf_page.cpp",
-    "core/src/fpdfapi/fpdf_page/fpdf_page_colors.cpp",
-    "core/src/fpdfapi/fpdf_page/fpdf_page_doc.cpp",
-    "core/src/fpdfapi/fpdf_page/fpdf_page_func.cpp",
-    "core/src/fpdfapi/fpdf_page/fpdf_page_graph_state.cpp",
-    "core/src/fpdfapi/fpdf_page/fpdf_page_image.cpp",
-    "core/src/fpdfapi/fpdf_page/fpdf_page_parser.cpp",
-    "core/src/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp",
-    "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/cfdf_document.cpp",
-    "core/src/fpdfapi/fpdf_parser/cpdf_array.cpp",
-    "core/src/fpdfapi/fpdf_parser/cpdf_boolean.cpp",
-    "core/src/fpdfapi/fpdf_parser/cpdf_data_avail.cpp",
-    "core/src/fpdfapi/fpdf_parser/cpdf_data_avail.h",
-    "core/src/fpdfapi/fpdf_parser/cpdf_dictionary.cpp",
-    "core/src/fpdfapi/fpdf_parser/cpdf_document.cpp",
-    "core/src/fpdfapi/fpdf_parser/cpdf_hint_tables.cpp",
-    "core/src/fpdfapi/fpdf_parser/cpdf_hint_tables.h",
-    "core/src/fpdfapi/fpdf_parser/cpdf_indirect_object_holder.cpp",
-    "core/src/fpdfapi/fpdf_parser/cpdf_name.cpp",
-    "core/src/fpdfapi/fpdf_parser/cpdf_null.cpp",
-    "core/src/fpdfapi/fpdf_parser/cpdf_number.cpp",
-    "core/src/fpdfapi/fpdf_parser/cpdf_object.cpp",
-    "core/src/fpdfapi/fpdf_parser/cpdf_parser.cpp",
-    "core/src/fpdfapi/fpdf_parser/cpdf_reference.cpp",
-    "core/src/fpdfapi/fpdf_parser/cpdf_simple_parser.cpp",
-    "core/src/fpdfapi/fpdf_parser/cpdf_standard_crypto_handler.cpp",
-    "core/src/fpdfapi/fpdf_parser/cpdf_standard_crypto_handler.h",
-    "core/src/fpdfapi/fpdf_parser/cpdf_standard_security_handler.cpp",
-    "core/src/fpdfapi/fpdf_parser/cpdf_standard_security_handler.h",
-    "core/src/fpdfapi/fpdf_parser/cpdf_stream.cpp",
-    "core/src/fpdfapi/fpdf_parser/cpdf_string.cpp",
-    "core/src/fpdfapi/fpdf_parser/cpdf_syntax_parser.cpp",
-    "core/src/fpdfapi/fpdf_parser/cpdf_syntax_parser.h",
-    "core/src/fpdfapi/fpdf_parser/fpdf_parser_decode.cpp",
-    "core/src/fpdfapi/fpdf_parser/fpdf_parser_utility.cpp",
-    "core/src/fpdfapi/fpdf_parser/fpdf_parser_utility.h",
-    "core/src/fpdfapi/fpdf_render/fpdf_render.cpp",
-    "core/src/fpdfapi/fpdf_render/fpdf_render_cache.cpp",
-    "core/src/fpdfapi/fpdf_render/fpdf_render_image.cpp",
-    "core/src/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp",
-    "core/src/fpdfapi/fpdf_render/fpdf_render_pattern.cpp",
-    "core/src/fpdfapi/fpdf_render/fpdf_render_text.cpp",
-    "core/src/fpdfapi/fpdf_render/render_int.h",
   ]
   configs += [ ":pdfium_config" ]
 }
 
 static_library("fpdftext") {
   sources = [
+    "core/fpdftext/fpdf_text_int.cpp",
+    "core/fpdftext/text_int.h",
+    "core/fpdftext/unicodenormalization.cpp",
+    "core/fpdftext/unicodenormalizationdata.cpp",
+    "core/fpdftext/unicodenormalizationdata.h",
     "core/include/fpdftext/fpdf_text.h",
-    "core/src/fpdftext/fpdf_text_int.cpp",
-    "core/src/fpdftext/text_int.h",
-    "core/src/fpdftext/unicodenormalization.cpp",
-    "core/src/fpdftext/unicodenormalizationdata.cpp",
-    "core/src/fpdftext/unicodenormalizationdata.h",
   ]
   configs += [ ":pdfium_config" ]
 }
 
 static_library("fxcodec") {
   deps = [
     "third_party:fx_lcms2",
     "third_party:fx_libopenjpeg",
     "third_party:fx_zlib",
 
     # This is a generic JPEG library dependency.
     "//third_party:jpeg",
   ]
   sources = [
+    "core/fxcodec/codec/codec_int.h",
+    "core/fxcodec/codec/fx_codec.cpp",
+    "core/fxcodec/codec/fx_codec_fax.cpp",
+    "core/fxcodec/codec/fx_codec_flate.cpp",
+    "core/fxcodec/codec/fx_codec_icc.cpp",
+    "core/fxcodec/codec/fx_codec_jbig.cpp",
+    "core/fxcodec/codec/fx_codec_jpeg.cpp",
+    "core/fxcodec/codec/fx_codec_jpx_opj.cpp",
+    "core/fxcodec/jbig2/JBig2_ArithDecoder.cpp",
+    "core/fxcodec/jbig2/JBig2_ArithDecoder.h",
+    "core/fxcodec/jbig2/JBig2_ArithIntDecoder.cpp",
+    "core/fxcodec/jbig2/JBig2_ArithIntDecoder.h",
+    "core/fxcodec/jbig2/JBig2_BitStream.cpp",
+    "core/fxcodec/jbig2/JBig2_BitStream.h",
+    "core/fxcodec/jbig2/JBig2_Context.cpp",
+    "core/fxcodec/jbig2/JBig2_Context.h",
+    "core/fxcodec/jbig2/JBig2_Define.h",
+    "core/fxcodec/jbig2/JBig2_GrdProc.cpp",
+    "core/fxcodec/jbig2/JBig2_GrdProc.h",
+    "core/fxcodec/jbig2/JBig2_GrrdProc.cpp",
+    "core/fxcodec/jbig2/JBig2_GrrdProc.h",
+    "core/fxcodec/jbig2/JBig2_GsidProc.cpp",
+    "core/fxcodec/jbig2/JBig2_GsidProc.h",
+    "core/fxcodec/jbig2/JBig2_HtrdProc.cpp",
+    "core/fxcodec/jbig2/JBig2_HtrdProc.h",
+    "core/fxcodec/jbig2/JBig2_HuffmanDecoder.cpp",
+    "core/fxcodec/jbig2/JBig2_HuffmanDecoder.h",
+    "core/fxcodec/jbig2/JBig2_HuffmanTable.cpp",
+    "core/fxcodec/jbig2/JBig2_HuffmanTable.h",
+    "core/fxcodec/jbig2/JBig2_HuffmanTable_Standard.h",
+    "core/fxcodec/jbig2/JBig2_Image.cpp",
+    "core/fxcodec/jbig2/JBig2_Image.h",
+    "core/fxcodec/jbig2/JBig2_List.h",
+    "core/fxcodec/jbig2/JBig2_Page.h",
+    "core/fxcodec/jbig2/JBig2_PatternDict.cpp",
+    "core/fxcodec/jbig2/JBig2_PatternDict.h",
+    "core/fxcodec/jbig2/JBig2_PddProc.cpp",
+    "core/fxcodec/jbig2/JBig2_PddProc.h",
+    "core/fxcodec/jbig2/JBig2_SddProc.cpp",
+    "core/fxcodec/jbig2/JBig2_SddProc.h",
+    "core/fxcodec/jbig2/JBig2_Segment.cpp",
+    "core/fxcodec/jbig2/JBig2_Segment.h",
+    "core/fxcodec/jbig2/JBig2_SymbolDict.cpp",
+    "core/fxcodec/jbig2/JBig2_SymbolDict.h",
+    "core/fxcodec/jbig2/JBig2_TrdProc.cpp",
+    "core/fxcodec/jbig2/JBig2_TrdProc.h",
     "core/include/fxcodec/fx_codec.h",
     "core/include/fxcodec/fx_codec_def.h",
     "core/include/fxcodec/fx_codec_flate.h",
-    "core/src/fxcodec/codec/codec_int.h",
-    "core/src/fxcodec/codec/fx_codec.cpp",
-    "core/src/fxcodec/codec/fx_codec_fax.cpp",
-    "core/src/fxcodec/codec/fx_codec_flate.cpp",
-    "core/src/fxcodec/codec/fx_codec_icc.cpp",
-    "core/src/fxcodec/codec/fx_codec_jbig.cpp",
-    "core/src/fxcodec/codec/fx_codec_jpeg.cpp",
-    "core/src/fxcodec/codec/fx_codec_jpx_opj.cpp",
-    "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_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_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",
-    "core/src/fxcodec/jbig2/JBig2_HuffmanTable.h",
-    "core/src/fxcodec/jbig2/JBig2_HuffmanTable_Standard.h",
-    "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_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/jbig2/JBig2_TrdProc.cpp",
-    "core/src/fxcodec/jbig2/JBig2_TrdProc.h",
   ]
   include_dirs = []
   if (pdf_enable_xfa) {
     sources += [
-      "core/src/fxcodec/codec/fx_codec_bmp.cpp",
-      "core/src/fxcodec/codec/fx_codec_gif.cpp",
-      "core/src/fxcodec/codec/fx_codec_png.cpp",
-      "core/src/fxcodec/codec/fx_codec_progress.cpp",
-      "core/src/fxcodec/codec/fx_codec_progress.h",
-      "core/src/fxcodec/codec/fx_codec_tiff.cpp",
-      "core/src/fxcodec/lbmp/fx_bmp.cpp",
-      "core/src/fxcodec/lbmp/fx_bmp.h",
-      "core/src/fxcodec/lgif/fx_gif.cpp",
-      "core/src/fxcodec/lgif/fx_gif.h",
+      "core/fxcodec/codec/fx_codec_bmp.cpp",
+      "core/fxcodec/codec/fx_codec_gif.cpp",
+      "core/fxcodec/codec/fx_codec_png.cpp",
+      "core/fxcodec/codec/fx_codec_progress.cpp",
+      "core/fxcodec/codec/fx_codec_progress.h",
+      "core/fxcodec/codec/fx_codec_tiff.cpp",
+      "core/fxcodec/lbmp/fx_bmp.cpp",
+      "core/fxcodec/lbmp/fx_bmp.h",
+      "core/fxcodec/lgif/fx_gif.cpp",
+      "core/fxcodec/lgif/fx_gif.h",
     ]
     deps += [
       "third_party:fx_lpng",
       "third_party:fx_tiff",
     ]
   }
   if (is_posix) {
-    # core/src/fxcodec/fx_libopenjpeg/src/fx_mct.c does an pointer-to-int
+    # core/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" ]
 }
 
 config("fxge_warnings") {
   if (is_clang) {
     cflags = [
       # http://code.google.com/p/pdfium/issues/detail?id=188
       "-Wno-switch",
     ]
   }
 }
 
 static_library("fxcrt") {
   sources = [
+    "core/fxcrt/extension.h",
+    "core/fxcrt/fx_basic_array.cpp",
+    "core/fxcrt/fx_basic_bstring.cpp",
+    "core/fxcrt/fx_basic_buffer.cpp",
+    "core/fxcrt/fx_basic_coords.cpp",
+    "core/fxcrt/fx_basic_gcc.cpp",
+    "core/fxcrt/fx_basic_list.cpp",
+    "core/fxcrt/fx_basic_memmgr.cpp",
+    "core/fxcrt/fx_basic_plex.cpp",
+    "core/fxcrt/fx_basic_utf.cpp",
+    "core/fxcrt/fx_basic_util.cpp",
+    "core/fxcrt/fx_basic_wstring.cpp",
+    "core/fxcrt/fx_bidi.cpp",
+    "core/fxcrt/fx_extension.cpp",
+    "core/fxcrt/fx_ucddata.cpp",
+    "core/fxcrt/fx_unicode.cpp",
+    "core/fxcrt/fx_xml_composer.cpp",
+    "core/fxcrt/fx_xml_parser.cpp",
+    "core/fxcrt/fxcrt_platforms.cpp",
+    "core/fxcrt/fxcrt_platforms.h",
+    "core/fxcrt/fxcrt_posix.cpp",
+    "core/fxcrt/fxcrt_posix.h",
+    "core/fxcrt/fxcrt_stream.cpp",
+    "core/fxcrt/fxcrt_windows.cpp",
+    "core/fxcrt/fxcrt_windows.h",
+    "core/fxcrt/plex.h",
+    "core/fxcrt/xml_int.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/fx_basic_array.cpp",
-    "core/src/fxcrt/fx_basic_bstring.cpp",
-    "core/src/fxcrt/fx_basic_buffer.cpp",
-    "core/src/fxcrt/fx_basic_coords.cpp",
-    "core/src/fxcrt/fx_basic_gcc.cpp",
-    "core/src/fxcrt/fx_basic_list.cpp",
-    "core/src/fxcrt/fx_basic_memmgr.cpp",
-    "core/src/fxcrt/fx_basic_plex.cpp",
-    "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_stream.cpp",
-    "core/src/fxcrt/fxcrt_windows.cpp",
-    "core/src/fxcrt/fxcrt_windows.h",
-    "core/src/fxcrt/plex.h",
-    "core/src/fxcrt/xml_int.h",
   ]
   if (pdf_enable_xfa) {
     sources += [
+      "core/fxcrt/fx_arabic.cpp",
+      "core/fxcrt/fx_arabic.h",
+      "core/fxcrt/fx_basic_maps.cpp",
       "core/include/fxcrt/fx_arb.h",
-      "core/src/fxcrt/fx_arabic.cpp",
-      "core/src/fxcrt/fx_arabic.h",
-      "core/src/fxcrt/fx_basic_maps.cpp",
     ]
   }
   configs += [ ":pdfium_config" ]
 }
 
 static_library("fxge") {
   deps = [
     "third_party:fx_agg",
   ]
   sources = [
+    "core/fxge/agg/fx_agg_driver.cpp",
+    "core/fxge/agg/fx_agg_driver.h",
+    "core/fxge/android/fpf_skiafont.cpp",
+    "core/fxge/android/fpf_skiafont.h",
+    "core/fxge/android/fpf_skiafontmgr.cpp",
+    "core/fxge/android/fpf_skiafontmgr.h",
+    "core/fxge/android/fpf_skiamodule.cpp",
+    "core/fxge/android/fpf_skiamodule.h",
+    "core/fxge/android/fx_android_font.cpp",
+    "core/fxge/android/fx_android_font.h",
+    "core/fxge/android/fx_android_imp.cpp",
+    "core/fxge/apple/apple_int.h",
+    "core/fxge/apple/fx_apple_platform.cpp",
+    "core/fxge/apple/fx_mac_imp.cpp",
+    "core/fxge/apple/fx_quartz_device.cpp",
+    "core/fxge/dib/dib_int.h",
+    "core/fxge/dib/fx_dib_composite.cpp",
+    "core/fxge/dib/fx_dib_convert.cpp",
+    "core/fxge/dib/fx_dib_engine.cpp",
+    "core/fxge/dib/fx_dib_main.cpp",
+    "core/fxge/dib/fx_dib_transform.cpp",
+    "core/fxge/fontdata/chromefontdata/FoxitDingbats.cpp",
+    "core/fxge/fontdata/chromefontdata/FoxitFixed.cpp",
+    "core/fxge/fontdata/chromefontdata/FoxitFixedBold.cpp",
+    "core/fxge/fontdata/chromefontdata/FoxitFixedBoldItalic.cpp",
+    "core/fxge/fontdata/chromefontdata/FoxitFixedItalic.cpp",
+    "core/fxge/fontdata/chromefontdata/FoxitSans.cpp",
+    "core/fxge/fontdata/chromefontdata/FoxitSansBold.cpp",
+    "core/fxge/fontdata/chromefontdata/FoxitSansBoldItalic.cpp",
+    "core/fxge/fontdata/chromefontdata/FoxitSansItalic.cpp",
+    "core/fxge/fontdata/chromefontdata/FoxitSansMM.cpp",
+    "core/fxge/fontdata/chromefontdata/FoxitSerif.cpp",
+    "core/fxge/fontdata/chromefontdata/FoxitSerifBold.cpp",
+    "core/fxge/fontdata/chromefontdata/FoxitSerifBoldItalic.cpp",
+    "core/fxge/fontdata/chromefontdata/FoxitSerifItalic.cpp",
+    "core/fxge/fontdata/chromefontdata/FoxitSerifMM.cpp",
+    "core/fxge/fontdata/chromefontdata/FoxitSymbol.cpp",
+    "core/fxge/fontdata/chromefontdata/chromefontdata.h",
+    "core/fxge/freetype/fx_freetype.cpp",
+    "core/fxge/ge/fx_ge.cpp",
+    "core/fxge/ge/fx_ge_device.cpp",
+    "core/fxge/ge/fx_ge_font.cpp",
+    "core/fxge/ge/fx_ge_fontmap.cpp",
+    "core/fxge/ge/fx_ge_linux.cpp",
+    "core/fxge/ge/fx_ge_path.cpp",
+    "core/fxge/ge/fx_ge_ps.cpp",
+    "core/fxge/ge/fx_ge_text.cpp",
+    "core/fxge/ge/fx_text_int.h",
     "core/include/fxge/fpf.h",
     "core/include/fxge/fx_dib.h",
     "core/include/fxge/fx_font.h",
     "core/include/fxge/fx_freetype.h",
     "core/include/fxge/fx_ge.h",
     "core/include/fxge/fx_ge_apple.h",
     "core/include/fxge/fx_ge_win32.h",
-    "core/src/fxge/agg/fx_agg_driver.cpp",
-    "core/src/fxge/agg/fx_agg_driver.h",
-    "core/src/fxge/android/fpf_skiafont.cpp",
-    "core/src/fxge/android/fpf_skiafont.h",
-    "core/src/fxge/android/fpf_skiafontmgr.cpp",
-    "core/src/fxge/android/fpf_skiafontmgr.h",
-    "core/src/fxge/android/fpf_skiamodule.cpp",
-    "core/src/fxge/android/fpf_skiamodule.h",
-    "core/src/fxge/android/fx_android_font.cpp",
-    "core/src/fxge/android/fx_android_font.h",
-    "core/src/fxge/android/fx_android_imp.cpp",
-    "core/src/fxge/apple/apple_int.h",
-    "core/src/fxge/apple/fx_apple_platform.cpp",
-    "core/src/fxge/apple/fx_mac_imp.cpp",
-    "core/src/fxge/apple/fx_quartz_device.cpp",
-    "core/src/fxge/dib/dib_int.h",
-    "core/src/fxge/dib/fx_dib_composite.cpp",
-    "core/src/fxge/dib/fx_dib_convert.cpp",
-    "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/FoxitDingbats.cpp",
-    "core/src/fxge/fontdata/chromefontdata/FoxitFixed.cpp",
-    "core/src/fxge/fontdata/chromefontdata/FoxitFixedBold.cpp",
-    "core/src/fxge/fontdata/chromefontdata/FoxitFixedBoldItalic.cpp",
-    "core/src/fxge/fontdata/chromefontdata/FoxitFixedItalic.cpp",
-    "core/src/fxge/fontdata/chromefontdata/FoxitSans.cpp",
-    "core/src/fxge/fontdata/chromefontdata/FoxitSansBold.cpp",
-    "core/src/fxge/fontdata/chromefontdata/FoxitSansBoldItalic.cpp",
-    "core/src/fxge/fontdata/chromefontdata/FoxitSansItalic.cpp",
-    "core/src/fxge/fontdata/chromefontdata/FoxitSansMM.cpp",
-    "core/src/fxge/fontdata/chromefontdata/FoxitSerif.cpp",
-    "core/src/fxge/fontdata/chromefontdata/FoxitSerifBold.cpp",
-    "core/src/fxge/fontdata/chromefontdata/FoxitSerifBoldItalic.cpp",
-    "core/src/fxge/fontdata/chromefontdata/FoxitSerifItalic.cpp",
-    "core/src/fxge/fontdata/chromefontdata/FoxitSerifMM.cpp",
-    "core/src/fxge/fontdata/chromefontdata/FoxitSymbol.cpp",
-    "core/src/fxge/fontdata/chromefontdata/chromefontdata.h",
-    "core/src/fxge/freetype/fx_freetype.cpp",
-    "core/src/fxge/ge/fx_ge.cpp",
-    "core/src/fxge/ge/fx_ge_device.cpp",
-    "core/src/fxge/ge/fx_ge_font.cpp",
-    "core/src/fxge/ge/fx_ge_fontmap.cpp",
-    "core/src/fxge/ge/fx_ge_linux.cpp",
-    "core/src/fxge/ge/fx_ge_path.cpp",
-    "core/src/fxge/ge/fx_ge_ps.cpp",
-    "core/src/fxge/ge/fx_ge_text.cpp",
-    "core/src/fxge/ge/fx_text_int.h",
   ]
 
   configs += [
     ":fxge_warnings",
     ":pdfium_config",
   ]
 
   if (pdf_use_skia) {
     sources = [
-      "core/src/fxge/skia/fx_skia_device.cpp",
+      "core/fxge/skia/fx_skia_device.cpp",
     ]
     deps = [
       "//skia",
     ]
   }
 
   if (is_win) {
     sources += [
-      "core/src/fxge/win32/dwrite_int.h",
-      "core/src/fxge/win32/fx_win32_device.cpp",
-      "core/src/fxge/win32/fx_win32_dib.cpp",
-      "core/src/fxge/win32/fx_win32_dwrite.cpp",
-      "core/src/fxge/win32/fx_win32_gdipext.cpp",
-      "core/src/fxge/win32/fx_win32_print.cpp",
-      "core/src/fxge/win32/win32_int.h",
+      "core/fxge/win32/dwrite_int.h",
+      "core/fxge/win32/fx_win32_device.cpp",
+      "core/fxge/win32/fx_win32_dib.cpp",
+      "core/fxge/win32/fx_win32_dwrite.cpp",
+      "core/fxge/win32/fx_win32_gdipext.cpp",
+      "core/fxge/win32/fx_win32_print.cpp",
+      "core/fxge/win32/win32_int.h",
     ]
     configs -= [ "//build/config/win:lean_and_mean" ]
   }
 }
 
 static_library("fxedit") {
   sources = [
     "fpdfsdk/include/fxedit/fx_edit.h",
     "fpdfsdk/include/fxedit/fxet_edit.h",
     "fpdfsdk/include/fxedit/fxet_list.h",
@@ skipping 793 matching lines @@
     configs -= [ "//build/config/compiler:chromium_code" ]
     configs += [
       ":pdfium_config",
       "//build/config/compiler:no_chromium_code",
     ]
   }
 }
 
 test("pdfium_unittests") {
   sources = [
-    "core/src/fpdfapi/fpdf_font/fpdf_font_cid_unittest.cpp",
-    "core/src/fpdfapi/fpdf_font/fpdf_font_unittest.cpp",
-    "core/src/fpdfapi/fpdf_page/fpdf_page_parser_old_unittest.cpp",
-    "core/src/fpdfapi/fpdf_parser/cpdf_object_unittest.cpp",
-    "core/src/fpdfapi/fpdf_parser/cpdf_parser_unittest.cpp",
-    "core/src/fpdfapi/fpdf_parser/cpdf_simple_parser_unittest.cpp",
-    "core/src/fpdfapi/fpdf_parser/cpdf_syntax_parser_unittest.cpp",
-    "core/src/fpdfapi/fpdf_parser/fpdf_parser_decode_unittest.cpp",
-    "core/src/fpdfdoc/doc_basic_unittest.cpp",
-    "core/src/fpdftext/fpdf_text_int_unittest.cpp",
-    "core/src/fxcodec/codec/fx_codec_jpx_unittest.cpp",
-    "core/src/fxcrt/fx_basic_bstring_unittest.cpp",
-    "core/src/fxcrt/fx_basic_gcc_unittest.cpp",
-    "core/src/fxcrt/fx_basic_memmgr_unittest.cpp",
-    "core/src/fxcrt/fx_basic_wstring_unittest.cpp",
-    "core/src/fxcrt/fx_bidi_unittest.cpp",
-    "core/src/fxcrt/fx_extension_unittest.cpp",
-    "core/src/fxcrt/fx_system_unittest.cpp",
+    "core/fpdfapi/fpdf_font/fpdf_font_cid_unittest.cpp",
+    "core/fpdfapi/fpdf_font/fpdf_font_unittest.cpp",
+    "core/fpdfapi/fpdf_page/fpdf_page_parser_old_unittest.cpp",
+    "core/fpdfapi/fpdf_parser/cpdf_object_unittest.cpp",
+    "core/fpdfapi/fpdf_parser/cpdf_parser_unittest.cpp",
+    "core/fpdfapi/fpdf_parser/cpdf_simple_parser_unittest.cpp",
+    "core/fpdfapi/fpdf_parser/cpdf_syntax_parser_unittest.cpp",
+    "core/fpdfapi/fpdf_parser/fpdf_parser_decode_unittest.cpp",
+    "core/fpdfdoc/doc_basic_unittest.cpp",
+    "core/fpdftext/fpdf_text_int_unittest.cpp",
+    "core/fxcodec/codec/fx_codec_jpx_unittest.cpp",
+    "core/fxcrt/fx_basic_bstring_unittest.cpp",
+    "core/fxcrt/fx_basic_gcc_unittest.cpp",
+    "core/fxcrt/fx_basic_memmgr_unittest.cpp",
+    "core/fxcrt/fx_basic_wstring_unittest.cpp",
+    "core/fxcrt/fx_bidi_unittest.cpp",
+    "core/fxcrt/fx_extension_unittest.cpp",
+    "core/fxcrt/fx_system_unittest.cpp",
     "fpdfsdk/src/fpdfdoc_unittest.cpp",
   ]
   deps = [
     ":pdfium",
     ":test_support",
     "//testing/gtest",
     "//testing/gtest:gtest_main",
   ]
   if (pdf_enable_xfa) {
     sources += [
       "xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder_unittest.cpp",
       "xfa/src/fxfa/parser/xfa_utils_imp_unittest.cpp",
     ]
   }
   configs += [ ":pdfium_config" ]
 }
 
 test("pdfium_embeddertests") {
   sources = [
-    "core/src/fpdfapi/fpdf_page/fpdf_page_func_embeddertest.cpp",
-    "core/src/fpdfapi/fpdf_parser/cpdf_parser_embeddertest.cpp",
-    "core/src/fpdfapi/fpdf_parser/fpdf_parser_decode_embeddertest.cpp",
-    "core/src/fpdfapi/fpdf_render/fpdf_render_loadimage_embeddertest.cpp",
-    "core/src/fpdfapi/fpdf_render/fpdf_render_pattern_embeddertest.cpp",
+    "core/fpdfapi/fpdf_page/fpdf_page_func_embeddertest.cpp",
+    "core/fpdfapi/fpdf_parser/cpdf_parser_embeddertest.cpp",
+    "core/fpdfapi/fpdf_parser/fpdf_parser_decode_embeddertest.cpp",
+    "core/fpdfapi/fpdf_render/fpdf_render_loadimage_embeddertest.cpp",
+    "core/fpdfapi/fpdf_render/fpdf_render_pattern_embeddertest.cpp",
     "fpdfsdk/src/fpdf_dataavail_embeddertest.cpp",
     "fpdfsdk/src/fpdfdoc_embeddertest.cpp",
     "fpdfsdk/src/fpdfedit_embeddertest.cpp",
     "fpdfsdk/src/fpdfext_embeddertest.cpp",
     "fpdfsdk/src/fpdfformfill_embeddertest.cpp",
     "fpdfsdk/src/fpdfsave_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",
@@ skipping 23 matching lines @@
       "//v8:v8_libplatform",
     ]
     include_dirs += [
       "//v8",
       "//v8/include",
     ]
     configs += [ "//v8:external_startup_data" ]
   }
   configs += [ ":pdfium_config" ]
 }