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

gyp/gm.gyp

Index: gyp/gm.gyp
diff --git a/gyp/gm.gyp b/gyp/gm.gyp
index b430da13207b2747465cb72a5bf7e448eccd8afd..504b11ec20bbcd2999df1dc693dd2058b2041d97 100644
--- a/gyp/gm.gyp
+++ b/gyp/gm.gyp
@@ -33,7 +33,6 @@
         '../src/pipe/utils/',
         '../src/utils/',
         '../src/utils/debugger',
-        '../experimental/PdfViewer',
       ],
       'includes': [
         'gmslides.gypi',
@@ -59,13 +58,18 @@
         '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': [