From 508eba53219ec814ab00914e63f777ba2a4ecab8 Mon Sep 17 00:00:00 2001
From: "xians@google.com"
 <xians@google.com@4adac7df-926f-26a2-2b94-8c16560cd09d>
Date: Mon, 8 Aug 2011 12:48:13 +0000
Subject: [PATCH] exclude vp8 and test_framework test targets from chromium.

BUG=http://code.google.com/p/webrtc/issues/detail?id=34
Test=None
Review URL: http://webrtc-codereview.appspot.com/95012

git-svn-id: http://webrtc.googlecode.com/svn/trunk@324 4adac7df-926f-26a2-2b94-8c16560cd09d
---
 .../codecs/test_framework/test_framework.gyp  | 88 ++++++++++---------
 .../codecs/vp8/main/source/vp8.gyp            | 58 ++++++------
 2 files changed, 78 insertions(+), 68 deletions(-)

diff --git a/src/modules/video_coding/codecs/test_framework/test_framework.gyp b/src/modules/video_coding/codecs/test_framework/test_framework.gyp
index 861e1a4150..22f2ccb63a 100644
--- a/src/modules/video_coding/codecs/test_framework/test_framework.gyp
+++ b/src/modules/video_coding/codecs/test_framework/test_framework.gyp
@@ -6,53 +6,57 @@
   'includes': [
     '../../../../common_settings.gypi', # Common settings
   ],
-  'targets': [
-    {
-      'target_name': 'test_framework',
-      'type': '<(library)',
+  # Exclude the test target when building with chromium.
+  'conditions': [   
+    ['build_with_chromium==0', {
+      'targets': [
+        {
+          'target_name': 'test_framework',
+          'type': '<(library)',
 
-      'dependencies': [
-        '../../../../system_wrappers/source/system_wrappers.gyp:system_wrappers',
-        '../../../../common_video/vplib/main/source/vplib.gyp:webrtc_vplib',
-      ],
+          'dependencies': [
+            '../../../../system_wrappers/source/system_wrappers.gyp:system_wrappers',
+            '../../../../common_video/vplib/main/source/vplib.gyp:webrtc_vplib',
+          ],
 
-      'include_dirs': [
-        '../interface',
-        '../../../../common_video/interface',
-      ],
+          'include_dirs': [
+            '../interface',
+            '../../../../common_video/interface',
+          ],
 
-      'direct_dependent_settings': {
-        'include_dirs': [
-          '../interface',
-        ],
-      },
+          'direct_dependent_settings': {
+            'include_dirs': [
+              '../interface',
+            ],
+          },
 
-      'sources': [
-        # header files
-        'benchmark.h',
-        'normal_async_test.h',
-        'normal_test.h',
-        'packet_loss_test.h',
-        'performance_test.h',
-        'test.h',
-        'unit_test.h',
-        'video_buffer.h',
-        'video_source.h',
+          'sources': [
+            # header files
+            'benchmark.h',
+            'normal_async_test.h',
+            'normal_test.h',
+            'packet_loss_test.h',
+            'performance_test.h',
+            'test.h',
+            'unit_test.h',
+            'video_buffer.h',
+            'video_source.h',
 
-        # source files
-        'benchmark.cc',
-        'normal_async_test.cc',
-        'normal_test.cc',
-        'packet_loss_test.cc',
-        'performance_test.cc',
-        'test.cc',
-        'unit_test.cc',
-        'video_buffer.cc',
-        'video_source.cc',
-
-      ],
-    },
-  ],
+            # source files
+            'benchmark.cc',
+            'normal_async_test.cc',
+            'normal_test.cc',
+            'packet_loss_test.cc',
+            'performance_test.cc',
+            'test.cc',
+            'unit_test.cc',
+            'video_buffer.cc',
+            'video_source.cc',
+          ],
+        },
+      ], # targets
+    }], # build_with_chromium
+  ], # conditions
 }
 
 # Local Variables:
diff --git a/src/modules/video_coding/codecs/vp8/main/source/vp8.gyp b/src/modules/video_coding/codecs/vp8/main/source/vp8.gyp
index 808b258b75..4f7aeb8f46 100644
--- a/src/modules/video_coding/codecs/vp8/main/source/vp8.gyp
+++ b/src/modules/video_coding/codecs/vp8/main/source/vp8.gyp
@@ -68,33 +68,39 @@
         'vp8.cc',
       ],
     },
+  ], # targets
+  # Exclude the test target when building with chromium.
+  'conditions': [   
+    ['build_with_chromium==0', {
+      'targets': [
+        {
+          'target_name': 'vp8_test',
+          'type': 'executable',
+          'dependencies': [
+            'webrtc_vp8',
+            '../../../../../../system_wrappers/source/system_wrappers.gyp:system_wrappers',
+            '../../../test_framework/test_framework.gyp:test_framework',
+            '../../../../../../common_video/vplib/main/source/vplib.gyp:webrtc_vplib'
+          ],
+         'sources': [
+            # header files
+            '../test/benchmark.h',
+            '../test/normal_async_test.h',
+            '../test/packet_loss_test.h',
+            '../test/unit_test.h',
+            '../test/dual_decoder_test.h',
 
-    {
-      'target_name': 'vp8_test',
-      'type': 'executable',
-      'dependencies': [
-        'webrtc_vp8',
-        '../../../../../../system_wrappers/source/system_wrappers.gyp:system_wrappers',
-        '../../../test_framework/test_framework.gyp:test_framework',
-        '../../../../../../common_video/vplib/main/source/vplib.gyp:webrtc_vplib'
-      ],
-      'sources': [
-        # header files
-        '../test/benchmark.h',
-        '../test/normal_async_test.h',
-        '../test/packet_loss_test.h',
-        '../test/unit_test.h',
-        '../test/dual_decoder_test.h',
-
-        # source files
-        '../test/benchmark.cc',
-        '../test/normal_async_test.cc',
-        '../test/packet_loss_test.cc',
-        '../test/tester.cc',
-        '../test/unit_test.cc',
-        '../test/dual_decoder_test.cc',
-      ],
-    },
+           # source files
+            '../test/benchmark.cc',
+            '../test/normal_async_test.cc',
+            '../test/packet_loss_test.cc',
+            '../test/tester.cc',
+            '../test/unit_test.cc',
+            '../test/dual_decoder_test.cc',
+          ],
+        },
+      ], # targets
+    }], # build_with_chromium
   ],
 }