Revert of GYP groudwork for half-float opts support.

gyp/opts.gyp

 {
   # Source lists live in opts.gypi.  This makes it easier to maintain our Chrome GYP/GN setup.
   # (To be honest, I'm not sure why we need to include common.gypi.  I thought it was automatic.)
   'variables': {
     'includes': [ 'common.gypi', 'opts.gypi' ],
   },
 
   # Generally we shove things into one 'opts' target conditioned on platform.
   # If a particular platform needs some files built with different flags,
   # those become separate targets: opts_ssse3, opts_sse41, opts_neon.
@@ skipping 10 matching lines @@
       ],
       'include_dirs': [
         '../src/core',
         '../src/opts',
         '../src/utils',
         '../include/utils',
       ],
       'conditions': [
         [ 'skia_arch_type == "x86" and skia_os != "ios"', {
           'cflags': [ '-msse2' ],
-          'dependencies': [ 'opts_ssse3', 'opts_sse41', 'opts_avx' ],
+          'dependencies': [ 'opts_ssse3', 'opts_sse41' ],
           'sources': [ '<@(sse2_sources)' ],
         }],
 
         [ 'skia_arch_type == "mips"', {
           'conditions': [
             [ '(mips_arch_variant == "mips32r2") and (mips_dsp == 1 or mips_dsp == 2)', {
                 'sources': [ '<@(mips_dsp_sources)' ],
             },{
                 'sources': [ '<@(none_sources)' ],
             }],
           ]
         }],
 
         [ '(skia_arch_type == "arm" and arm_version < 7) \
             or (skia_os == "ios") \
             or (skia_os == "android" and skia_arch_type not in ["x86", "arm", "mips", "arm64"])', {
           'sources': [ '<@(none_sources)' ],
         }],
 
         [ 'skia_arch_type == "arm" and arm_version >= 7', {
           # The assembly uses the frame pointer register (r7 in Thumb/r11 in
           # ARM), the compiler doesn't like that.
           'cflags!': [ '-fno-omit-frame-pointer', '-mapcs-frame', '-mapcs' ],
           'cflags':  [ '-fomit-frame-pointer' ],
           'variables': { 'arm_neon_optional%': '<(arm_neon_optional>' },
           'sources': [ '<@(armv7_sources)' ],
-          'dependencies': [ 'opts_neon_fp16' ],
           'conditions': [
             [ 'arm_neon == 1 or arm_neon_optional == 1', {
               'dependencies': [ 'opts_neon' ]
             }],
             [ 'skia_os == "ios"', {
               'sources!': [
                 # these fail to compile under xcode for ios
                 '../src/opts/memset.arm.S',
                 '../src/opts/SkBitmapProcState_opts_arm.cpp',
                 '../src/opts/SkBlitRow_opts_arm.cpp',
@@ skipping 45 matching lines @@
         }],
         [ 'not skia_android_framework', {
           'cflags': [ '-msse4.1' ],
         }],
         [ 'skia_os == "mac"', {
           'xcode_settings': { 'GCC_ENABLE_SSE41_EXTENSIONS': 'YES' },
         }],
       ],
     },
     {
-      'target_name': 'opts_avx',
-      'product_name': 'skia_opts_avx',
-      'type': 'static_library',
-      'standalone_static_library': 1,
-      'dependencies': [ 'core.gyp:*' ],
-      'sources': [ '<@(avx_sources)' ],
-      'conditions': [
-        [ 'skia_os == "win"', {
-            'defines' : [ 'SK_CPU_SSE_LEVEL=50' ],
-            'msvs_settings': { 'VCCLCompilerTool': { 'EnabledEnhancedInstructionSet': '3' } },
-        }],
-        [ 'not skia_android_framework', {
-          'cflags': [ '-mavx' ],
-        }],
-        [ 'skia_os == "mac"', {
-          'xcode_settings': { 'OTHER_CPLUSPLUSFLAGS': [ '-mavx' ] },
-        }],
-      ],
-    },
-    {
       'target_name': 'opts_neon',
       'product_name': 'skia_opts_neon',
       'type': 'static_library',
       'standalone_static_library': 1,
       'dependencies': [
         'core.gyp:*',
         'effects.gyp:*'
       ],
       'include_dirs': [
         '../src/core',
@@ skipping 13 matching lines @@
             '-mfpu=neon',
             '-fomit-frame-pointer',
           ],
         }],
       ],
       'ldflags': [
         '-march=armv7-a',
         '-Wl,--fix-cortex-a8',
       ],
     },
-    {
-      'target_name': 'opts_neon_fp16',
-      'product_name': 'skia_opts_neon_fp16',
-      'type': 'static_library',
-      'standalone_static_library': 1,
-      'dependencies': [ 'core.gyp:*' ],
-      'include_dirs': [ '../src/core' ],
-      'sources': [ '<@(neon_fp16_sources)' ],
-      'conditions': [
-        [ 'not skia_android_framework', {
-          'cflags': [
-            '-mfpu=neon-fp16',
-            '-mfp16-format=ieee',
-            '-fomit-frame-pointer',
-          ],
-        }],
-      ],
-      'ldflags': [
-        '-march=armv7-a',
-        '-Wl,--fix-cortex-a8',
-      ],
-    },
   ],
 }