Reland: Move VideoCapture* files from media/base/android/... to media/capture/video/android/java/...

media/media.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'chromium_code': 1,
     # Override to dynamically link the cras (ChromeOS audio) library.
     'use_cras%': 0,
     # Option e.g. for Linux distributions to link pulseaudio directly
@@ skipping 727 matching lines @@
             ],
           },
           # Exclude the sources that depend on libvpx.
           'sources!': [
             'filters/vpx_video_decoder.cc',
             'filters/vpx_video_decoder.h',
           ],
         }],
         ['OS=="android"', {
           'dependencies': [
+            'capture_java',
             'media_android_jni_headers',
             'media_java',
             'player_android',
             'video_capture_android_jni_headers',
           ],
           'sources!': [
             'base/audio_video_metadata_extractor.cc',
             'base/audio_video_metadata_extractor.h',
             'base/media_file_checker.cc',
             'base/media_file_checker.h',
@@ skipping 1055 matching lines @@
         },
       ], # targets
     }],
     ['OS=="android"', {
       'targets': [
         {
           # TODO(GN)
           'target_name': 'media_unittests_apk',
           'type': 'none',
           'dependencies': [
+            'capture_java',
             'media_java',
             'media_unittests',
           ],
           'variables': {
             'test_suite_name': 'media_unittests',
             'isolate_file': 'media_unittests.isolate',
           },
           'includes': ['../build/apk_test.gypi'],
         },
         {
           # TODO(GN)
           'target_name': 'media_perftests_apk',
           'type': 'none',
           'dependencies': [
+            'capture_java',
             'media_java',
             'media_perftests',
           ],
           'variables': {
             'test_suite_name': 'media_perftests',
             'isolate_file': 'media_perftests.isolate',
           },
           'includes': ['../build/apk_test.gypi'],
         },
         {
-          # GN: //media/base/android:media_android_jni_headers
+          # GN: //media/base/android:media_jni_headers
           'target_name': 'media_android_jni_headers',
           'type': 'none',
           'sources': [
             'base/android/java/src/org/chromium/media/AudioManagerAndroid.java',
             'base/android/java/src/org/chromium/media/AudioRecordInput.java',
             'base/android/java/src/org/chromium/media/MediaCodecBridge.java',
             'base/android/java/src/org/chromium/media/MediaCodecUtil.java',
             'base/android/java/src/org/chromium/media/MediaDrmBridge.java',
             'base/android/java/src/org/chromium/media/MediaPlayerBridge.java',
             'base/android/java/src/org/chromium/media/MediaPlayerListener.java',
           ],
           'variables': {
             'jni_gen_package': 'media',
           },
           'includes': ['../build/jni_generator.gypi'],
         },
         {
-          # GN: //media/base/android:video_capture_android_jni_headers
+          # GN: //media/capture/video/android:capture_jni_headers
           'target_name': 'video_capture_android_jni_headers',
           'type': 'none',
           'sources': [
-            'base/android/java/src/org/chromium/media/VideoCapture.java',
-            'base/android/java/src/org/chromium/media/VideoCaptureFactory.java',
+            'capture/video/android/java/src/org/chromium/media/VideoCapture.java',
+            'capture/video/android/java/src/org/chromium/media/VideoCaptureFactory.java',
           ],
           'variables': {
             'jni_gen_package': 'media',
           },
           'includes': ['../build/jni_generator.gypi'],
         },
         {
           # GN: //media/base/android:android
           'target_name': 'player_android',
           'type': 'static_library',
@@ skipping 44 matching lines @@
             'base/android/media_task_runner.cc',
             'base/android/media_task_runner.h',
             'base/android/media_url_interceptor.h',
             'base/android/provision_fetcher.h',
             'base/android/sdk_media_codec_bridge.cc',
             'base/android/sdk_media_codec_bridge.h',
             'base/android/video_decoder_job.cc',
             '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
             ['target_arch=="arm64" or target_arch=="x64" or target_arch=="mips64el"', {
               'sources': [
                 'base/android/ndk_media_codec_bridge.cc',
                 'base/android/ndk_media_codec_bridge.h',
                 'base/android/ndk_media_codec_wrapper.cc',
               ],
             }],
           ],
           'dependencies': [
             '../base/base.gyp:base',
             '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h',
             '../ui/gl/gl.gyp:gl',
             '../url/url.gyp:url_lib',
             'media_android_jni_headers',
             'shared_memory_support',
           ],
           'include_dirs': [
             # Needed by media_drm_bridge.cc.
             '<(SHARED_INTERMEDIATE_DIR)',
           ],
           'defines': [
             'MEDIA_IMPLEMENTATION',
           ],
         },
         {
-          # GN: //media/base/android:media_java
-          'target_name': 'media_java',
+          # GN: //media/capture/video/android:capture_java
+          'target_name': 'capture_java',
           'type': 'none',
           'dependencies': [
             '../base/base.gyp:base',
             'media_android_captureapitype',
             'media_android_imageformat',
           ],
           'export_dependent_settings': [
             '../base/base.gyp:base',
           ],
           'variables': {
+            'java_in_dir': 'capture/video/android/java',
+          },
+          'includes': ['../build/java.gypi'],
+        },
+        {
+          # GN: //media/base/android:media_java
+          'target_name': 'media_java',
+          'type': 'none',
+          'dependencies': [
+            '../base/base.gyp:base',
+          ],
+          'export_dependent_settings': [
+            '../base/base.gyp:base',
+          ],
+          'variables': {
             'java_in_dir': 'base/android/java',
           },
           'includes': ['../build/java.gypi'],
         },
         {
           # GN: //media/base/android:media_android_captureapitype
           'target_name': 'media_android_captureapitype',
           'type': 'none',
           'variables': {
             'source_file': 'capture/video/video_capture_device.h',
@@ skipping 175 matching lines @@
               'dependencies': [
                 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
               ],
             }],
           ],
         },
       ],
     }],
   ],
 }