Revert of Add build targets for Opus tests.

third_party/opus/opus.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'conditions': [
       # TODO(wtc): change "mipselx" to "mipsel" in this file when the
       # compilation errors in the MIPS optimizations are fixed.
       ['target_arch=="arm" or target_arch=="arm64" or target_arch=="mipselx"', {
@@ skipping 13 matching lines @@
       }],
       ['target_arch=="arm" and (OS=="win" or OS=="android" or OS=="linux")', {
         # Based on the conditions in celt/arm/armcpu.c:
         # defined(_MSC_VER) || defined(__linux__).
         'use_opus_rtcd%': 1,
       }, {
         'use_opus_rtcd%': 0,
       }],
     ],
   },
-  'target_defaults': {
-    'target_conditions': [
-      ['_type=="executable"', {
-        # All of the executable targets depend on 'opus'. Unfortunately the
-        # 'dependencies' block cannot be inherited via 'target_defaults'.
-        'include_dirs': [
-          'src/celt',
-          'src/silk',
-        ],
-        'conditions': [
-          ['OS == "win"', {
-            'defines': [
-              'inline=__inline',
-            ],
-          }],
-          ['OS=="android"', {
-            'libraries': [
-              '-llog',
-            ],
-          }],
-          ['clang==1', {
-            'cflags': [ '-Wno-absolute-value' ],
-          }]
-        ],
-      }],
-    ],
-  },
   'targets': [
     {
       'target_name': 'opus',
       'type': 'static_library',
       'defines': [
         'OPUS_BUILD',
         'OPUS_EXPORT=',
       ],
       'include_dirs': [
         'src/celt',
@@ skipping 100 matching lines @@
           ],
         }],
       ],
     },  # target opus
     {
       'target_name': 'opus_compare',
       'type': 'executable',
       'dependencies': [
         'opus'
       ],
+      'conditions': [
+        ['OS == "win"', {
+          'defines': [
+            'inline=__inline',
+          ],
+        }],
+        ['OS=="android"', {
+          'link_settings': {
+            'libraries': [
+              '-llog',
+            ],
+          },
+        }],
+        ['clang==1', {
+          'cflags': [ '-Wno-absolute-value' ],
+        }]
+      ],
       'sources': [
         'src/src/opus_compare.c',
       ],
+      'include_dirs': [
+        'src/celt',
+        'src/silk',
+      ],
     },  # target opus_compare
     {
       'target_name': 'opus_demo',
       'type': 'executable',
       'dependencies': [
         'opus'
       ],
+      'conditions': [
+        ['OS == "win"', {
+          'defines': [
+            'inline=__inline',
+          ],
+        }],
+        ['OS=="android"', {
+          'link_settings': {
+            'libraries': [
+              '-llog',
+            ],
+          },
+        }],
+        ['clang==1', {
+          'cflags': [ '-Wno-absolute-value' ],
+        }]
+      ],
       'sources': [
         'src/src/opus_demo.c',
       ],
+      'include_dirs': [
+        'src/celt',
+        'src/silk',
+      ],
     },  # target opus_demo
-    {
-      'target_name': 'test_opus_api',
-      'type': 'executable',
-      'dependencies': [
-        'opus'
-      ],
-      'sources': [
-        'src/tests/test_opus_api.c',
-      ],
-    },  # target test_opus_api
-    {
-      'target_name': 'test_opus_encode',
-      'type': 'executable',
-      'dependencies': [
-        'opus'
-      ],
-      'sources': [
-        'src/tests/test_opus_encode.c',
-      ],
-    },  # target test_opus_encode
-    {
-      'target_name': 'test_opus_decode',
-      'type': 'executable',
-      'dependencies': [
-        'opus'
-      ],
-      'sources': [
-        'src/tests/test_opus_decode.c',
-      ],
-      # test_opus_decode passes a null pointer to opus_decode() for an argument
-      # marked as requiring a non-null value by the nonnull function attribute,
-      # and expects opus_decode() to fail. Disable the -Wnonnull option to avoid
-      # a compilation error if -Werror is specified.
-      'conditions': [
-        ['os_posix==1 and OS!="mac" and OS!="ios"', {
-          'cflags': ['-Wno-nonnull'],
-        }],
-        ['OS=="mac" or OS=="ios"', {
-          'xcode_settings': {
-            'WARNING_CFLAGS': ['-Wno-nonnull'],
-          },
-        }],
-      ],
-    },  # target test_opus_decode
-    {
-      'target_name': 'test_opus_padding',
-      'type': 'executable',
-      'dependencies': [
-        'opus'
-      ],
-      'sources': [
-        'src/tests/test_opus_padding.c',
-      ],
-    },  # target test_opus_padding
   ]
 }