Reverting all changes to the gyp files as they aren't used anymore

diff --git a/gyp/codec.gyp b/gyp/codec.gyp
index c0d0408..51ee97f 100644 (file)
--- a/gyp/codec.gyp
+++ b/gyp/codec.gyp
@@ -15,7 +15,6 @@
       'product_name': 'skia_codec',
       'type': 'static_library',
       'standalone_static_library': 1,
-      'msvs_disabled_warnings': [ 4267 ],
       'dependencies': [
         'core.gyp:*',
         'libjpeg-turbo-selector.gyp:libjpeg-turbo-selector',

diff --git a/gyp/common.gypi b/gyp/common.gypi
index 9e86419..a072798 100644 (file)
--- a/gyp/common.gypi
+++ b/gyp/common.gypi
@@ -91,7 +91,7 @@
         'configurations': {
           'Debug':   { 'defines': [ 'SK_DEBUG=1' ] },
           'Release': { 'defines': [ 'NDEBUG' ] },
-          'ReleaseDeveloper': {
+          'Release_Developer': {
             'inherit_from': ['Release'],
             'defines': [ 'SK_DEBUG=1' ],
             'conditions': [

diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi
index d2510d1..e3afd67 100644 (file)
--- a/gyp/common_conditions.gypi
+++ b/gyp/common_conditions.gypi
@@ -18,9 +18,6 @@
     'SK_HAS_JPEG_LIBRARY',
     'SK_HAS_PNG_LIBRARY',
     'SK_HAS_WEBP_LIBRARY',
-
-    'SKIA_C_DLL',
-    'SKIA_IMPLEMENTATION=1',
   ],
   'conditions' : [
     [ 'skia_is_bot', {
@@ -67,11 +64,9 @@
           'NOMINMAX',
         ],
         'msvs_disabled_warnings': [
-            4251,  # An exported class member was of a type that was not exported
             4275,  # An exported class was derived from a class that was not exported
             4345,  # This is an FYI about a behavior change from long ago. Chrome stifles it too.
             4355,  # 'this' used in base member initializer list. Off by default in newer compilers.
-            4334,  # '<<': result of 32-bit shift implicitly converted to 64 bits (was 64-bit shift intended?)
         ],
         'msvs_cygwin_shell': 0,
         'msvs_settings': {
@@ -171,8 +166,8 @@
                   },
                 },
               },
-              'ReleaseDeveloper_x64': {
-                'inherit_from': ['ReleaseDeveloper'],
+              'Release_Developer_x64': {
+                'inherit_from': ['Release_Developer'],
                 'msvs_settings': {
                   'VCCLCompilerTool': {
                      # Don't specify /arch. SSE2 is implied by 64bit and specifying it warns.
@@ -251,8 +246,6 @@
           '-std=c++11',
           '-fno-rtti',
           '-fno-threadsafe-statics',
-          '-fvisibility=hidden',
-          '-fvisibility-inlines-hidden',
           '-Wnon-virtual-dtor',
         ],
         'ldflags': [ '-rdynamic' ],
@@ -439,8 +432,6 @@
           'Release': {
             'cflags': [
               '-O<(skia_release_optimization_level)',
-              '-ffunction-sections',
-              '-fdata-sections',
             ],
             'defines': [ 'NDEBUG' ],
           },
@@ -629,11 +620,7 @@
         ],
         'configurations': {
           'Release': {
-            'cflags': [
-              '-O<(skia_release_optimization_level)',
-              '-ffunction-sections',
-              '-fdata-sections',
-            ],
+            'cflags': ['-O2'],
             'conditions': [
               [ 'skia_clang_build', {
                 'cflags!': ['-g'],

diff --git a/gyp/common_variables.gypi b/gyp/common_variables.gypi
index 9280c47..9fef11b 100644 (file)
--- a/gyp/common_variables.gypi
+++ b/gyp/common_variables.gypi
@@ -156,7 +156,7 @@
       # These variables determine the default optimization level for different
       # compilers.
       'skia_default_vs_optimization_level': 3, # full (/Ox)
-      'skia_default_gcc_optimization_level': 's', # -O3
+      'skia_default_gcc_optimization_level': 3, # -O3
     },
 
     'conditions': [

diff --git a/gyp/core.gyp b/gyp/core.gyp
index 2a2349d..0fbc56c 100644 (file)
--- a/gyp/core.gyp
+++ b/gyp/core.gyp
@@ -14,18 +14,13 @@
 
       'include_dirs': [
         '../include/c',
-        '../include/codec',
         '../include/config',
         '../include/core',
-        '../include/effects',
         '../include/pathops',
         '../include/ports',
         '../include/private',
         '../include/utils',
         '../include/images',
-        '../include/gpu',
-        '../include/xml',
-        '../include/svg',
         '../src/core',
         '../src/sfnt',
         '../src/image',

diff --git a/gyp/dng_sdk.gyp b/gyp/dng_sdk.gyp
index 78aadb7..05d6c25 100644 (file)
--- a/gyp/dng_sdk.gyp
+++ b/gyp/dng_sdk.gyp
@@ -13,7 +13,6 @@
     '-DqDNGUseXMP=0',
     '-DqDNGValidate=0',
     '-DqDNGValidateTarget=1',
-    '-DqDNGPrintMessages=1', # WinRT especially, but no popups on any platform
     '-fexceptions',
     '-frtti',
     '-w',

diff --git a/gyp/effects.gyp b/gyp/effects.gyp
index 8b1186b..9b90d75 100644 (file)
--- a/gyp/effects.gyp
+++ b/gyp/effects.gyp
@@ -10,7 +10,6 @@
       'product_name': 'skia_effects',
       'type': 'static_library',
       'standalone_static_library': 1,
-      'msvs_disabled_warnings': [4244],
       'dependencies': [
         'core.gyp:*',
         'images.gyp:*',

diff --git a/gyp/gpu.gyp b/gyp/gpu.gyp
index a3cf0a7..8b50fda 100644 (file)
--- a/gyp/gpu.gyp
+++ b/gyp/gpu.gyp
@@ -76,7 +76,6 @@
       'product_name': 'skia_skgpu',
       'type': 'static_library',
       'standalone_static_library': 1,
-      'msvs_disabled_warnings': [ 4244, 4267, 4800 ],
       'dependencies': [
         'core.gyp:*',
         'utils.gyp:utils',

diff --git a/gyp/opts.gyp b/gyp/opts.gyp
index f8f90bf..6dc6f85 100644 (file)
--- a/gyp/opts.gyp
+++ b/gyp/opts.gyp
@@ -110,7 +110,6 @@
           '../src/utils',
       ],
       'sources': [ '<!@(python read_gni.py ../gn/opts.gni ssse3)' ],
-      'xcode_settings': { 'CLANG_X86_VECTOR_INSTRUCTIONS': 'ssse3' },
       'conditions': [
         [ 'skia_os == "win"', { 'defines' : [ 'SK_CPU_SSE_LEVEL=31' ] }],
         [ 'not skia_android_framework', { 'cflags': [ '-mssse3' ] }],
@@ -121,7 +120,6 @@
       'product_name': 'skia_opts_sse41',
       'type': 'static_library',
       'standalone_static_library': 1,
-      'msvs_disabled_warnings': [ 4244, 4267 ],
       'dependencies': [ 'core.gyp:*' ],
       'include_dirs': [
           '../include/private',
@@ -176,7 +174,6 @@
       'product_name': 'skia_opts_hsw',
       'type': 'static_library',
       'standalone_static_library': 1,
-      'msvs_disabled_warnings': [ 4244, 4267 ],
       'dependencies': [ 'core.gyp:*' ],
       'include_dirs': [
           '../include/private',

diff --git a/gyp/sksl.gyp b/gyp/sksl.gyp
index 3f84b20..da0cdff 100644 (file)
--- a/gyp/sksl.gyp
+++ b/gyp/sksl.gyp
@@ -8,7 +8,6 @@
       'target_name': 'sksl',
       'type': 'static_library',
       'standalone_static_library': 1,
-      'msvs_disabled_warnings': [ 4267 ],
       'sources': [ '<!@(python read_gni.py ../gn/sksl.gni skia_sksl_sources)' ],
       'include_dirs': [
         '../include/config',