Revert of Add build targets for Opus tests.

third_party/opus/opus.gyp

Index: third_party/opus/opus.gyp
diff --git a/third_party/opus/opus.gyp b/third_party/opus/opus.gyp
index 1ee104d71332d0f88f4704db40bc5a1c89c87481..5fdeea6e230ea7176fcf06f392a8bf27107c2d58 100644
--- a/third_party/opus/opus.gyp
+++ b/third_party/opus/opus.gyp
@@ -28,33 +28,6 @@
         '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' ],
-          }]
-        ],
       }],
     ],
   },
@@ -178,8 +151,29 @@
       '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
     {
@@ -188,63 +182,30 @@
       '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
   ]
 }