media/media.gyp - Issue 2093563004: Revert of Extract media/capture/capture_unittests from media_unittests

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: media/media.gyp

Issue 2093563004: Revert of Extract media/capture/capture_unittests from media_unittests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: media/media.gyp

diff --git a/media/media.gyp b/media/media.gyp

index f2a42f8581a423963dc475c01b2c1cfba7da96f1..6bfddabc25404693805537d5c21ae16561576e18 100644

--- a/media/media.gyp

+++ b/media/media.gyp

@@ -1075,6 +1075,8 @@

'type': '<(gtest_target_type)',

'dependencies': [

'audio_test_config',

+ # TODO(mcasas): Remove this entry after https://crbug.com/618718.

+ 'capture/capture.gyp:unittests',

'cdm_paths',

'media',

'media_features',

@@ -1498,6 +1500,8 @@

'type': '<(gtest_target_type)',

'dependencies': [

'audio_test_config',

+ # TODO(mcasas): Remove this entry after https://crbug.com/618718.

+ 'capture/capture.gyp:unittests',

'media_test_support',

'../base/base.gyp:test_support_base',

'../testing/gmock.gyp:gmock',

@@ -1853,6 +1857,8 @@

'base/android/video_decoder_job.h',

'base/android/video_media_codec_decoder.cc',

'base/android/video_media_codec_decoder.h',

+ 'capture/video/android/capture_jni_registrar.cc',

+ 'capture/video/android/capture_jni_registrar.h',

'conditions': [

# Only 64 bit builds are using android-21 NDK library, check common.gypi

« no previous file with comments | « media/capture/video/android/photo_capabilities.h ('k') | testing/buildbot/chromium.android.json » ('j') | no next file with comments »