commit 26eaf7c7f724b0ebb599dfc0906223309cffc128
author andrew@webrtc.org <andrew@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Tue Jun 17 16:10:20 2014 +0000
committer andrew@webrtc.org <andrew@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Tue Jun 17 16:10:20 2014 +0000
tree 4e3d172952ae47805c843707267753958e8bd8ad
parent 2eaac188bbda9fb2b838a71833024d1975360fa1

Add a check to all.gyp to respect the include_tests variable.

When include_tests==0, tests should be excluded from the build. This
ensures libjingle_tests.gyp is excluded appropriately.

BUG=b/15673188
R=tnakamura@webrtc.org, wu@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/16729005

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6469 4adac7df-926f-26a2-2b94-8c16560cd09d

all.gyp

diff --git a/all.gyp b/all.gyp
index bd8ee13..4830c54 100644
--- a/all.gyp
+++ b/all.gyp
@@ -9,6 +9,7 @@
 {
   'variables': {
     'libjingle_root%': '<(DEPTH)',
+    'include_tests%': 1,
   },
   'targets': [
     {
@@ -19,7 +20,6 @@
         'webrtc/webrtc.gyp:*',
         '<(libjingle_root)/talk/libjingle.gyp:*',
         '<(libjingle_root)/talk/libjingle_examples.gyp:*',
-        '<(libjingle_root)/talk/libjingle_tests.gyp:*',
       ],
       'conditions': [
         ['OS=="android"', {
@@ -27,6 +27,11 @@
             'webrtc/webrtc_examples.gyp:*',
           ],
         }],
+        ['include_tests==1', {
+          'dependencies': [
+            '<(libjingle_root)/talk/libjingle_tests.gyp:*',
+          ],
+        }],
       ],
     },
   ],