From c18729165a977fabe6ed28038d07965ac3204794 Mon Sep 17 00:00:00 2001
From: "kjellander@webrtc.org"
 <kjellander@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>
Date: Wed, 16 Apr 2014 12:59:49 +0000
Subject: [PATCH] Set include_internal_video_capture=1 for video_capture_tests

Having this override in the .gypi file avoids having to set it for the bots, which I think is best if we can avoid.

This CL also reverts r5869 so video_capture_tests are compiled for Android again.

BUG=2974,3152
TEST=Successfully ran:
git try -t compile
git try --bot=win_baremetal,mac_baremetal,linux_baremetal -t video_capture_tests
git try --bot=android_apk,android_apk_rel
Verified the change in webrtc/build/apk_tests.gyp makes the build compile successfully from a Chromium+WebRTC configured checkout for Android APK tests.

R=fischman@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5919 4adac7df-926f-26a2-2b94-8c16560cd09d
---
 webrtc/build/apk_tests.gyp                    | 24 +++++++++----------
 .../modules/video_capture/video_capture.gypi  |  9 +++++++
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/webrtc/build/apk_tests.gyp b/webrtc/build/apk_tests.gyp
index 92d26845c..f916cdf22 100644
--- a/webrtc/build/apk_tests.gyp
+++ b/webrtc/build/apk_tests.gyp
@@ -217,19 +217,17 @@
     {
       'target_name': 'video_capture_tests_apk',
       'type': 'none',
-      # TODO(kjellander): uncomment the following after adding
-      # include_internal_video_capture=1 to the APK buildbot's $GYP_DEFINES.
-      # 'variables': {
-      #   'test_suite_name': 'video_capture_tests',
-      #   'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)video_capture_tests<(SHARED_LIB_SUFFIX)',
-      # },
-      # 'dependencies': [
-      #   '<(webrtc_root)/modules/modules.gyp:video_capture_tests',
-      #   'video_capture_java',
-      # ],
-      # 'includes': [
-      #   '../../../build/apk_test.gypi',
-      # ],
+       'variables': {
+         'test_suite_name': 'video_capture_tests',
+         'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)video_capture_tests<(SHARED_LIB_SUFFIX)',
+       },
+       'dependencies': [
+         '<(webrtc_root)/modules/modules.gyp:video_capture_tests',
+         'video_capture_java',
+       ],
+       'includes': [
+         '../../../build/apk_test.gypi',
+       ],
     },
     {
       # Used only by video_capture_tests_apk above, and impossible to use in the
diff --git a/webrtc/modules/video_capture/video_capture.gypi b/webrtc/modules/video_capture/video_capture.gypi
index c638e698c..6df062a81 100644
--- a/webrtc/modules/video_capture/video_capture.gypi
+++ b/webrtc/modules/video_capture/video_capture.gypi
@@ -133,6 +133,15 @@
     },
   ],
   'conditions': [
+    ['include_tests==1 and build_with_chromium==1 and OS=="android" and gtest_target_type=="shared_library"', {
+      # Use WebRTC capture code for Android APK tests that are built from a
+      # Chromium checkout. Normally when built as a part of Chromium the
+      # Chromium video capture code is used. This overrides the default in
+      # webrtc/build/common.gypi.
+      'variables': {
+        'include_internal_video_capture': 1,
+      },
+    }],
     ['include_tests==1', {
       'targets': [
         {