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 5fdeea6e230ea7176fcf06f392a8bf27107c2d58..e4680b9c7aa191550361f80b63932c34634d65ea 100644
--- a/third_party/opus/opus.gyp
+++ b/third_party/opus/opus.gyp
@@ -31,6 +31,35 @@
       }],
     ],
   },
+  '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"', {
+            'link_settings': {

[wtc, 2015/01/30 19:32:23]

Just wanted to explain why I had to remove 'link_settings'.

When placed inside a 'target_conditions' section, 'link_settings' causes a GYP
error on the Android builtbots:

________ running '/usr/bin/python src/build/gyp_chromium' in
'/b/build/slave/android_compile_rel/build'
Updating projects from gyp files...
gyp: link_settings not allowed in the Debug configuration, found in target
/b/build/slave/android_compile_rel/build/src/third_party/opus/opus.gyp:test_opus_api#target
Error: Command /usr/bin/python src/build/gyp_chromium returned non-zero exit
status 1 in /b/build/slave/android_compile_rel/build
Hook '/usr/bin/python src/build/gyp_chromium' took 20.36 secs

I consulted Mark Mentovai. I don't understand his explanation of why GYP
disallows this, but he gave me his blessing for using 'libraries' alone, instead
of inside 'link_settings'.

+              'libraries': [
+                '-llog',
+              ],
+            },
+          }],
+          ['clang==1', {
+            'cflags': [ '-Wno-absolute-value' ],
+          }]
+        ],
+      }],
+    ],
+  },
   'targets': [
     {
       'target_name': 'opus',
@@ -151,30 +180,9 @@
       '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',
@@ -182,30 +190,49 @@
       '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',
+      ],
+    },  # target test_opus_decode
+    {
+      'target_name': 'test_opus_padding',
+      'type': 'executable',
+      'dependencies': [
+        'opus'
+      ],
+      'sources': [
+        'src/tests/test_opus_padding.c',
+      ],
+    },  # target test_opus_padding
   ]
 }