Merge https://codereview.chromium.org/897973002/ and https://codereview.chromium.org/902753002/ to …

pdfium.gyp

 {
   'variables': {
     'pdf_use_skia%': 0,
     'conditions': [
       ['OS=="linux"', {
         'bundle_freetype%': 0,
       }, {  # On Android there's no system FreeType. On Windows and Mac, only a
             # few methods are used from it.
         'bundle_freetype%': 1,
       }],    
@@ skipping 783 matching lines @@
         'fpdfsdk/src/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',
       ],
     },
     {
       'target_name': 'javascript',
       'type': 'static_library',
-        'include_dirs': [
-          '<(DEPTH)/v8',
-          '<(DEPTH)/v8/include',
-        ],
+      'include_dirs': [
+        '<(DEPTH)/v8',
+        '<(DEPTH)/v8/include',
+      ],
       'dependencies': [
         '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
-        '<(DEPTH)/v8/tools/gyp/v8.gyp:v8_libplatform',
       ],
       'export_dependent_settings': [
         '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
       ],
       'ldflags': [ '-L<(PRODUCT_DIR)',],
       'sources': [
         'fpdfsdk/include/javascript/app.h',
         'fpdfsdk/include/javascript/color.h',
         'fpdfsdk/include/javascript/console.h',
         'fpdfsdk/include/javascript/Consts.h',
@@ skipping 121 matching lines @@
         'fpdfsdk/src/fpdftext_embeddertest.cpp',
         'fpdfsdk/src/fpdfview_embeddertest.cpp',
         'testing/embedder_test.cpp',
         'testing/embedder_test.h',
         'testing/fx_string_testhelpers.cpp',
         'testing/fx_string_testhelpers.h',
       ],
     },
   ],
 }