Move fpdfsdk/src up to fpdfsdk/.

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 55 matching lines @@
   }
 
   if (is_clang) {
     # TODO(thestig): Fix all instances, remove this, pdfium:29
     cflags += [ "-Wno-sign-compare" ]
   }
 }
 
 static_library("pdfium") {
   sources = [
+    "fpdfsdk/fpdf_dataavail.cpp",
+    "fpdfsdk/fpdf_ext.cpp",
+    "fpdfsdk/fpdf_flatten.cpp",
+    "fpdfsdk/fpdf_progressive.cpp",
+    "fpdfsdk/fpdf_searchex.cpp",
+    "fpdfsdk/fpdf_sysfontinfo.cpp",
+    "fpdfsdk/fpdf_transformpage.cpp",
+    "fpdfsdk/fpdfdoc.cpp",
+    "fpdfsdk/fpdfeditimg.cpp",
+    "fpdfsdk/fpdfeditpage.cpp",
+    "fpdfsdk/fpdfformfill.cpp",
+    "fpdfsdk/fpdfppo.cpp",
+    "fpdfsdk/fpdfsave.cpp",
+    "fpdfsdk/fpdftext.cpp",
+    "fpdfsdk/fpdfview.cpp",
+    "fpdfsdk/fsdk_actionhandler.cpp",
+    "fpdfsdk/fsdk_annothandler.cpp",
+    "fpdfsdk/fsdk_baseannot.cpp",
+    "fpdfsdk/fsdk_baseform.cpp",
+    "fpdfsdk/fsdk_mgr.cpp",
+    "fpdfsdk/fsdk_rendercontext.cpp",
     "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",
-    "fpdfsdk/src/fpdfformfill.cpp",
-    "fpdfsdk/src/fpdfppo.cpp",
-    "fpdfsdk/src/fpdfsave.cpp",
-    "fpdfsdk/src/fpdftext.cpp",
-    "fpdfsdk/src/fpdfview.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",
     "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",
@@ skipping 521 matching lines @@
       "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/fxedit/fxet_ap.cpp",
+    "fpdfsdk/fxedit/fxet_edit.cpp",
+    "fpdfsdk/fxedit/fxet_list.cpp",
+    "fpdfsdk/fxedit/fxet_module.cpp",
+    "fpdfsdk/fxedit/fxet_pageobjs.cpp",
     "fpdfsdk/include/fxedit/fx_edit.h",
     "fpdfsdk/include/fxedit/fxet_edit.h",
     "fpdfsdk/include/fxedit/fxet_list.h",
-    "fpdfsdk/src/fxedit/fxet_ap.cpp",
-    "fpdfsdk/src/fxedit/fxet_edit.cpp",
-    "fpdfsdk/src/fxedit/fxet_list.cpp",
-    "fpdfsdk/src/fxedit/fxet_module.cpp",
-    "fpdfsdk/src/fxedit/fxet_pageobjs.cpp",
   ]
   configs += [ ":pdfium_config" ]
 }
 
 static_library("pdfwindow") {
   sources = [
     "fpdfsdk/include/pdfwindow/PWL_Button.h",
     "fpdfsdk/include/pdfwindow/PWL_Caret.h",
     "fpdfsdk/include/pdfwindow/PWL_ComboBox.h",
     "fpdfsdk/include/pdfwindow/PWL_Edit.h",
     "fpdfsdk/include/pdfwindow/PWL_EditCtrl.h",
     "fpdfsdk/include/pdfwindow/PWL_FontMap.h",
     "fpdfsdk/include/pdfwindow/PWL_Icon.h",
     "fpdfsdk/include/pdfwindow/PWL_IconList.h",
     "fpdfsdk/include/pdfwindow/PWL_Label.h",
     "fpdfsdk/include/pdfwindow/PWL_ListBox.h",
     "fpdfsdk/include/pdfwindow/PWL_ListCtrl.h",
     "fpdfsdk/include/pdfwindow/PWL_Note.h",
     "fpdfsdk/include/pdfwindow/PWL_ScrollBar.h",
     "fpdfsdk/include/pdfwindow/PWL_Signature.h",
     "fpdfsdk/include/pdfwindow/PWL_SpecialButton.h",
     "fpdfsdk/include/pdfwindow/PWL_Utils.h",
     "fpdfsdk/include/pdfwindow/PWL_Wnd.h",
-    "fpdfsdk/src/pdfwindow/PWL_Button.cpp",
-    "fpdfsdk/src/pdfwindow/PWL_Caret.cpp",
-    "fpdfsdk/src/pdfwindow/PWL_ComboBox.cpp",
-    "fpdfsdk/src/pdfwindow/PWL_Edit.cpp",
-    "fpdfsdk/src/pdfwindow/PWL_EditCtrl.cpp",
-    "fpdfsdk/src/pdfwindow/PWL_FontMap.cpp",
-    "fpdfsdk/src/pdfwindow/PWL_Icon.cpp",
-    "fpdfsdk/src/pdfwindow/PWL_IconList.cpp",
-    "fpdfsdk/src/pdfwindow/PWL_Label.cpp",
-    "fpdfsdk/src/pdfwindow/PWL_ListBox.cpp",
-    "fpdfsdk/src/pdfwindow/PWL_ListCtrl.cpp",
-    "fpdfsdk/src/pdfwindow/PWL_Note.cpp",
-    "fpdfsdk/src/pdfwindow/PWL_ScrollBar.cpp",
-    "fpdfsdk/src/pdfwindow/PWL_Signature.cpp",
-    "fpdfsdk/src/pdfwindow/PWL_SpecialButton.cpp",
-    "fpdfsdk/src/pdfwindow/PWL_Utils.cpp",
-    "fpdfsdk/src/pdfwindow/PWL_Wnd.cpp",
+    "fpdfsdk/pdfwindow/PWL_Button.cpp",
+    "fpdfsdk/pdfwindow/PWL_Caret.cpp",
+    "fpdfsdk/pdfwindow/PWL_ComboBox.cpp",
+    "fpdfsdk/pdfwindow/PWL_Edit.cpp",
+    "fpdfsdk/pdfwindow/PWL_EditCtrl.cpp",
+    "fpdfsdk/pdfwindow/PWL_FontMap.cpp",
+    "fpdfsdk/pdfwindow/PWL_Icon.cpp",
+    "fpdfsdk/pdfwindow/PWL_IconList.cpp",
+    "fpdfsdk/pdfwindow/PWL_Label.cpp",
+    "fpdfsdk/pdfwindow/PWL_ListBox.cpp",
+    "fpdfsdk/pdfwindow/PWL_ListCtrl.cpp",
+    "fpdfsdk/pdfwindow/PWL_Note.cpp",
+    "fpdfsdk/pdfwindow/PWL_ScrollBar.cpp",
+    "fpdfsdk/pdfwindow/PWL_Signature.cpp",
+    "fpdfsdk/pdfwindow/PWL_SpecialButton.cpp",
+    "fpdfsdk/pdfwindow/PWL_Utils.cpp",
+    "fpdfsdk/pdfwindow/PWL_Wnd.cpp",
   ]
   configs += [ ":pdfium_config" ]
 }
 
 static_library("javascript") {
   sources = [
     "fpdfsdk/include/javascript/IJavaScript.h",
   ]
   if (pdf_enable_v8) {
     sources += [
       "fpdfsdk/include/jsapi/fxjs_v8.h",
-      "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/src/jsapi/fxjs_v8.cpp",
+      "fpdfsdk/javascript/Consts.cpp",
+      "fpdfsdk/javascript/Consts.h",
+      "fpdfsdk/javascript/Document.cpp",
+      "fpdfsdk/javascript/Document.h",
+      "fpdfsdk/javascript/Field.cpp",
+      "fpdfsdk/javascript/Field.h",
+      "fpdfsdk/javascript/Icon.cpp",
+      "fpdfsdk/javascript/Icon.h",
+      "fpdfsdk/javascript/JS_Context.cpp",
+      "fpdfsdk/javascript/JS_Context.h",
+      "fpdfsdk/javascript/JS_Define.h",
+      "fpdfsdk/javascript/JS_EventHandler.cpp",
+      "fpdfsdk/javascript/JS_EventHandler.h",
+      "fpdfsdk/javascript/JS_GlobalData.cpp",
+      "fpdfsdk/javascript/JS_GlobalData.h",
+      "fpdfsdk/javascript/JS_Object.cpp",
+      "fpdfsdk/javascript/JS_Object.h",
+      "fpdfsdk/javascript/JS_Runtime.cpp",
+      "fpdfsdk/javascript/JS_Runtime.h",
+      "fpdfsdk/javascript/JS_Value.cpp",
+      "fpdfsdk/javascript/JS_Value.h",
+      "fpdfsdk/javascript/PublicMethods.cpp",
+      "fpdfsdk/javascript/PublicMethods.h",
+      "fpdfsdk/javascript/app.cpp",
+      "fpdfsdk/javascript/app.h",
+      "fpdfsdk/javascript/color.cpp",
+      "fpdfsdk/javascript/color.h",
+      "fpdfsdk/javascript/console.cpp",
+      "fpdfsdk/javascript/console.h",
+      "fpdfsdk/javascript/event.cpp",
+      "fpdfsdk/javascript/event.h",
+      "fpdfsdk/javascript/global.cpp",
+      "fpdfsdk/javascript/global.h",
+      "fpdfsdk/javascript/report.cpp",
+      "fpdfsdk/javascript/report.h",
+      "fpdfsdk/javascript/resource.cpp",
+      "fpdfsdk/javascript/resource.h",
+      "fpdfsdk/javascript/util.cpp",
+      "fpdfsdk/javascript/util.h",
+      "fpdfsdk/jsapi/fxjs_v8.cpp",
     ]
     include_dirs = [
       "//v8",
       "//v8/include",
     ]
     public_deps = [
       "//v8",
     ]
     configs += [ "//v8:external_startup_data" ]
   } else {
-    sources += [ "fpdfsdk/src/javascript/JS_Runtime_Stub.cpp" ]
+    sources += [ "fpdfsdk/javascript/JS_Runtime_Stub.cpp" ]
   }
   configs += [ ":pdfium_config" ]
 }
 
 static_library("formfiller") {
   sources = [
+    "fpdfsdk/formfiller/FFL_CBA_Fontmap.cpp",
+    "fpdfsdk/formfiller/FFL_CheckBox.cpp",
+    "fpdfsdk/formfiller/FFL_ComboBox.cpp",
+    "fpdfsdk/formfiller/FFL_FormFiller.cpp",
+    "fpdfsdk/formfiller/FFL_IFormFiller.cpp",
+    "fpdfsdk/formfiller/FFL_ListBox.cpp",
+    "fpdfsdk/formfiller/FFL_PushButton.cpp",
+    "fpdfsdk/formfiller/FFL_RadioButton.cpp",
+    "fpdfsdk/formfiller/FFL_TextField.cpp",
     "fpdfsdk/include/formfiller/FFL_CBA_Fontmap.h",
     "fpdfsdk/include/formfiller/FFL_CheckBox.h",
     "fpdfsdk/include/formfiller/FFL_ComboBox.h",
     "fpdfsdk/include/formfiller/FFL_FormFiller.h",
     "fpdfsdk/include/formfiller/FFL_IFormFiller.h",
     "fpdfsdk/include/formfiller/FFL_ListBox.h",
     "fpdfsdk/include/formfiller/FFL_PushButton.h",
     "fpdfsdk/include/formfiller/FFL_RadioButton.h",
     "fpdfsdk/include/formfiller/FFL_TextField.h",
-    "fpdfsdk/src/formfiller/FFL_CBA_Fontmap.cpp",
-    "fpdfsdk/src/formfiller/FFL_CheckBox.cpp",
-    "fpdfsdk/src/formfiller/FFL_ComboBox.cpp",
-    "fpdfsdk/src/formfiller/FFL_FormFiller.cpp",
-    "fpdfsdk/src/formfiller/FFL_IFormFiller.cpp",
-    "fpdfsdk/src/formfiller/FFL_ListBox.cpp",
-    "fpdfsdk/src/formfiller/FFL_PushButton.cpp",
-    "fpdfsdk/src/formfiller/FFL_RadioButton.cpp",
-    "fpdfsdk/src/formfiller/FFL_TextField.cpp",
   ]
   configs += [ ":pdfium_config" ]
 }
 
 if (pdf_enable_xfa) {
   static_library("fpdfxfa") {
     sources = [
+      "fpdfsdk/fpdfxfa/fpdfxfa_app.cpp",
+      "fpdfsdk/fpdfxfa/fpdfxfa_doc.cpp",
+      "fpdfsdk/fpdfxfa/fpdfxfa_page.cpp",
+      "fpdfsdk/fpdfxfa/fpdfxfa_util.cpp",
       "fpdfsdk/include/fpdfxfa/fpdfxfa_app.h",
       "fpdfsdk/include/fpdfxfa/fpdfxfa_doc.h",
       "fpdfsdk/include/fpdfxfa/fpdfxfa_page.h",
       "fpdfsdk/include/fpdfxfa/fpdfxfa_util.h",
-      "fpdfsdk/src/fpdfxfa/fpdfxfa_app.cpp",
-      "fpdfsdk/src/fpdfxfa/fpdfxfa_doc.cpp",
-      "fpdfsdk/src/fpdfxfa/fpdfxfa_page.cpp",
-      "fpdfsdk/src/fpdfxfa/fpdfxfa_util.cpp",
     ]
     deps = [
       ":xfa",
     ]
     configs -= [ "//build/config/compiler:chromium_code" ]
     configs += [
       ":pdfium_config",
       "//build/config/compiler:no_chromium_code",
     ]
   }
@@ skipping 655 matching lines @@
     "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",
+    "fpdfsdk/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/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",
-    "fpdfsdk/src/fsdk_baseform_embeddertest.cpp",
+    "fpdfsdk/fpdf_dataavail_embeddertest.cpp",
+    "fpdfsdk/fpdfdoc_embeddertest.cpp",
+    "fpdfsdk/fpdfedit_embeddertest.cpp",
+    "fpdfsdk/fpdfext_embeddertest.cpp",
+    "fpdfsdk/fpdfformfill_embeddertest.cpp",
+    "fpdfsdk/fpdfsave_embeddertest.cpp",
+    "fpdfsdk/fpdftext_embeddertest.cpp",
+    "fpdfsdk/fpdfview_c_api_test.c",
+    "fpdfsdk/fpdfview_c_api_test.h",
+    "fpdfsdk/fpdfview_embeddertest.cpp",
+    "fpdfsdk/fsdk_baseform_embeddertest.cpp",
     "testing/embedder_test.cpp",
     "testing/embedder_test.h",
     "testing/embedder_test_mock_delegate.h",
     "testing/embedder_test_timer_handling_delegate.h",
     "xfa/src/fxfa/parser/xfa_parser_imp_embeddertest.cpp",
   ]
   deps = [
     ":pdfium",
     ":test_support",
     "//testing/gmock",
     "//testing/gtest",
   ]
   include_dirs = []
   if (pdf_enable_v8) {
     sources += [
-      "fpdfsdk/src/javascript/public_methods_embeddertest.cpp",
-      "fpdfsdk/src/jsapi/fxjs_v8_embeddertest.cpp",
+      "fpdfsdk/javascript/public_methods_embeddertest.cpp",
+      "fpdfsdk/jsapi/fxjs_v8_embeddertest.cpp",
       "testing/js_embedder_test.cpp",
       "testing/js_embedder_test.h",
     ]
     deps += [
       "//v8",
       "//v8:v8_libplatform",
     ]
     include_dirs += [
       "//v8",
       "//v8/include",
     ]
     configs += [ "//v8:external_startup_data" ]
   }
   configs += [ ":pdfium_config" ]
 }