Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(486)

Unified Diff: media/media.gyp

Issue 1140113002: Implement screen capture for android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add ScreenCaptureMachineAndroid which inherited from content::VideoCaptureMachine Created 5 years, 7 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 f5e797b61fe5ea05cc3abeccf93be9587a92859d..f5bdc5fc21d7a6e10442674c31dced9d97791a29 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -680,12 +680,23 @@
'base/browser_cdm_factory.h',
],
}],
+ ['enable_webrtc==1 and OS=="android"', {
whywhat 2015/08/17 13:58:46 the 'enable_webrtc' condition doesn't have a match
+ 'sources': [
+ 'screen_capture/android/screen_capture_device_android.cc',
+ 'screen_capture/android/screen_capture_device_android.h',
+ 'screen_capture/android/screen_capture_factory_android.cc',
+ 'screen_capture/android/screen_capture_factory_android.h',
+ 'screen_capture/android/screen_capture_machine_android.cc',
+ 'screen_capture/android/screen_capture_machine_android.h',
+ ],
+ }],
['OS=="android"', {
'dependencies': [
'media_android_jni_headers',
'media_java',
'player_android',
'video_capture_android_jni_headers',
+ 'screen_capture_android_jni_headers',
],
'sources': [
'base/media.cc',
@@ -1716,6 +1727,19 @@
'includes': ['../build/jni_generator.gypi'],
},
{
+ # GN: //media/base/android:screen_capture_android_jni_headers
+ 'target_name': 'screen_capture_android_jni_headers',
+ 'type': 'none',
+ 'sources': [
+ 'base/android/java/src/org/chromium/media/ScreenCapture.java',
+ 'base/android/java/src/org/chromium/media/ScreenCaptureFactory.java',
+ ],
+ 'variables': {
+ 'jni_gen_package': 'media',
+ },
+ 'includes': ['../build/jni_generator.gypi'],
+ },
+ {
# GN: //media/base/android:android
'target_name': 'player_android',
'type': 'static_library',

Powered by Google App Engine
This is Rietveld 408576698