pdfviewer: compile pdfviewer in gm, only if the flag is set (currently we compile pdfviewer, even i…

gyp/gm.gyp

 # GYP file to build the "gm" (golden master) executable.
 {
   'includes': [
     'apptype_console.gypi',
   ],
   'targets': [
     {
       'target_name': 'gm_expectations',
       'type': 'static_library',
       'include_dirs' : [
@@ skipping 15 matching lines @@
     },
     {
       'target_name': 'gm',
       'type': 'executable',
       'include_dirs' : [
         '../src/core',
         '../src/effects',
         '../src/pipe/utils/',
         '../src/utils/',
         '../src/utils/debugger',
-        '../experimental/PdfViewer',
       ],
       'includes': [
         'gmslides.gypi',
       ],
       'sources': [
         '../gm/gm.cpp',
         '../gm/gmmain.cpp',
         '../gm/system_preferences_default.cpp',
 
         '../src/pipe/utils/SamplePipeControllers.h',
         '../src/pipe/utils/SamplePipeControllers.cpp',
 
         '../src/utils/debugger/SkDrawCommand.h',
         '../src/utils/debugger/SkDrawCommand.cpp',
         '../src/utils/debugger/SkDebugCanvas.h',
         '../src/utils/debugger/SkDebugCanvas.cpp',
         '../src/utils/debugger/SkObjectParser.h',
         '../src/utils/debugger/SkObjectParser.cpp',
       ],
       'dependencies': [
         'skia_lib.gyp:skia_lib',
         'flags.gyp:flags',
         'gm.gyp:gm_expectations',
         'jsoncpp.gyp:jsoncpp',
         'pdf.gyp:pdf',
-        'pdfviewer_lib.gyp:pdfviewer_lib',
       ],
       'conditions': [
         ['skia_run_pdfviewer_in_gm', {
           'defines': [
             'SK_BUILD_NATIVE_PDF_RENDERER',
           ],
+          'include_dirs' : [
+            '../experimental/PdfViewer',
+          ],
+          'dependencies': [
+            'pdfviewer_lib.gyp:pdfviewer_lib',
+          ],
         }],
         ['skia_os in ["linux", "mac", "win"]', {
           'dependencies': [
             'poppler.gyp:libpoppler-cpp-gpl',
           ],
           'sources': [
             '../src/utils/SkPDFRasterizer.cpp',
           ],
           'defines': [
             'SK_BUILD_POPPLER',
@@ skipping 29 matching lines @@
       ],
     },
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: