ScreenCapture for Android phase1, part I

media/media.gyp

Index: media/media.gyp
diff --git a/media/media.gyp b/media/media.gyp
index 3d7bf9970b69ca9ff3292fff025bce50b431d507..9211323f1682337876bf9222be4db5ce422deafc 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -58,6 +58,7 @@
       # GN version: //media:media_features
       'target_name': 'media_features',
       'includes': [ '../build/buildflag_header.gypi' ],
+      'hard_dependency': 1,
       'variables': {
         'buildflag_header_path': 'media/media_features.h',
         'buildflag_flags': [
@@ -83,15 +84,18 @@
         '../third_party/libwebm/libwebm.gyp:libwebm',
         '../third_party/libyuv/libyuv.gyp:libyuv',
         '../third_party/opus/opus.gyp:opus',
+        '../ui/display/display.gyp:display',
         '../ui/events/events.gyp:events_base',
         '../ui/gfx/gfx.gyp:gfx',
         '../ui/gfx/gfx.gyp:gfx_geometry',
         '../url/url.gyp:url_lib',
         'shared_memory_support',
       ],
+      'hard_dependency': 1,
       'export_dependent_settings': [
         '../third_party/libwebm/libwebm.gyp:libwebm',
         '../third_party/opus/opus.gyp:opus',
+        'media_features',
       ],
       'defines': [
         'MEDIA_IMPLEMENTATION',
@@ -339,8 +343,6 @@
         'base/eme_constants.h',
         'base/encryption_scheme.cc',
         'base/encryption_scheme.h',
-        'base/key_system_info.cc',
-        'base/key_system_info.h',
         'base/key_system_names.cc',
         'base/key_system_names.h',
         'base/key_system_properties.cc',
@@ -711,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!': [
@@ -1728,6 +1732,7 @@
             'capture_java',
             'media_java',
             'media_unittests',
+            'screen_capture_java',
           ],
           'variables': {
             'test_suite_name': 'media_unittests',
@@ -1743,6 +1748,7 @@
             'capture_java',
             'media_java',
             'media_perftests',
+            'screen_capture_java',
           ],
           'variables': {
             'test_suite_name': 'media_perftests',
@@ -1781,6 +1787,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',
@@ -1841,6 +1859,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',
           ],
@@ -1903,6 +1923,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',
@@ -2164,7 +2199,6 @@
     ['chromeos==1 or OS=="win" or OS=="android"', {
       'targets': [
           {
-            # TODO(GYP): Port Windows and ChromeOS logic.
             # GN: //media/gpu:video_decode_accelerator_unittest
             'target_name': 'video_decode_accelerator_unittest',
             'type': '<(gtest_target_type)',