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

Unified Diff: media/media.gyp

Issue 1917023003: ScreenCapture for Android phase1, part I (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address review comments Created 4 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 573e4bd62b2d40ddc2b4d1aa5397198a75866d5f..8025b1e272597d09bb47c66ad65bf433d4ec1e2d 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -713,6 +713,8 @@
'media_android_jni_headers',
'media_java',
'player_android',
+ 'screen_capture_java',
+ 'screen_capture_android_jni_headers',
'video_capture_android_jni_headers',
],
'sources!': [
@@ -1731,6 +1733,7 @@
'capture_java',
'media_java',
'media_unittests',
+ 'screen_capture_java',
],
'variables': {
'test_suite_name': 'media_unittests',
@@ -1746,6 +1749,7 @@
'capture_java',
'media_java',
'media_perftests',
+ 'screen_capture_java',
],
'variables': {
'test_suite_name': 'media_perftests',
@@ -1784,6 +1788,18 @@
},
'includes': ['../build/jni_generator.gypi'],
},
+ {
+ # GN: //media/capture/video/android:screen_capture_jni_headers
+ 'target_name': 'screen_capture_android_jni_headers',
+ 'type': 'none',
+ 'sources': [
+ 'capture/content/android/java/src/org/chromium/media/ScreenCapture.java',
+ ],
+ 'variables': {
+ 'jni_gen_package': 'media',
+ },
+ 'includes': ['../build/jni_generator.gypi'],
+ },
{
# GN: //media/base/android:android
'target_name': 'player_android',
@@ -1844,6 +1860,8 @@
'base/android/video_decoder_job.h',
'base/android/video_media_codec_decoder.cc',
'base/android/video_media_codec_decoder.h',
+ 'capture/content/android/screen_capture_jni_registrar.cc',
+ 'capture/content/android/screen_capture_jni_registrar.h',
'capture/video/android/capture_jni_registrar.cc',
'capture/video/android/capture_jni_registrar.h',
],
@@ -1906,6 +1924,21 @@
'includes': ['../build/java.gypi'],
},
{
+ # GN: //media/capture/content/android:screen_capture_java
+ 'target_name': 'screen_capture_java',
+ 'type': 'none',
+ 'dependencies': [
+ '../base/base.gyp:base',
+ ],
+ 'export_dependent_settings': [
+ '../base/base.gyp:base',
+ ],
+ 'variables': {
+ 'java_in_dir': 'capture/content/android/java',
+ },
+ 'includes': ['../build/java.gypi'],
+ },
+ {
# GN: //media/base/android:media_android_captureapitype
'target_name': 'media_android_captureapitype',
'type': 'none',

Powered by Google App Engine
This is Rietveld 408576698