remove flags that control no code

BUG=skia:

Review URL: https://codereview.chromium.org/1259653004

diff --git a/gyp/common.gypi b/gyp/common.gypi
index 6995834..b6f756d 100644 (file)
--- a/gyp/common.gypi
+++ b/gyp/common.gypi
@@ -15,7 +15,6 @@
       'SK_INTERNAL',
       'SK_GAMMA_SRGB',
       'SK_GAMMA_APPLY_TO_A8',
-      'SK_SCALAR_TO_FLOAT_EXCLUDED',  # temporary to allow Chrome to call SkFloatToScalar
       # 'SK_USE_DISCARDABLE_SCALEDIMAGECACHE',  # TODO(reed): Re-enable when tests don't crash with this.
     ],
 

diff --git a/gyp/pdf.gyp b/gyp/pdf.gyp
index 7efbb5c..693d330 100644 (file)
--- a/gyp/pdf.gyp
+++ b/gyp/pdf.gyp
@@ -45,12 +45,7 @@
           }
         ],
       ],
-      # This section makes all targets that depend on this target
-      # #define SK_SUPPORT_PDF and have access to the pdf header files.
       'direct_dependent_settings': {
-        'defines': [
-          'SK_SUPPORT_PDF',
-        ],
         'include_dirs': [
           '../include/core',  # SkDocument.h
         ],