Encrypted Media: Confine UUID code to MediaDrmBridge.

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 895 matching lines @@
         'media',
         'media_test_support',
         'shared_memory_support',
         '../base/base.gyp:base',
         '../base/base.gyp:base_i18n',
         '../base/base.gyp:test_support_base',
         '../gpu/gpu.gyp:command_buffer_common',
         '../skia/skia.gyp:skia',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
+        '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h',

[xhwang, 2014/03/04 00:18:58]

This is for kWidevineKeySystem, which is ugly... How about putting
kWidevineKeySystem in a common place in Chromium code base? e.g.
media/cdm/key_system_names.h

[ddorwin, 2014/03/04 20:00:56]

Let's discuss. For one thing, including this file helps identify places where
key system-specific code exists.

         '../ui/gfx/gfx.gyp:gfx',
         '../ui/gfx/gfx.gyp:gfx_geometry',
         '../ui/ui.gyp:ui',
       ],
       'sources': [
         'audio/android/audio_android_unittest.cc',
         'audio/alsa/alsa_output_unittest.cc',
         'audio/audio_input_controller_unittest.cc',
         'audio/audio_input_unittest.cc',
         'audio/audio_input_volume_unittest.cc',
@@ skipping 113 matching lines @@
         'formats/webm/cluster_builder.cc',
         'formats/webm/cluster_builder.h',
         'formats/webm/tracks_builder.cc',
         'formats/webm/tracks_builder.h',
         'formats/webm/webm_cluster_parser_unittest.cc',
         'formats/webm/webm_content_encodings_client_unittest.cc',
         'formats/webm/webm_parser_unittest.cc',
         'formats/webm/webm_tracks_parser_unittest.cc',
         'formats/webm/webm_webvtt_parser_unittest.cc',
       ],
+      'include_dirs': [
+        # Needed by media_drm_bridge.cc.
+        '<(SHARED_INTERMEDIATE_DIR)',

[ddorwin, 2014/03/04 20:00:56]

I believe this can be addressed by adding a dependent_settings item to
widevine_cdm.gyp:widevine_cdm_version_h. We just never got around to it. It
would clean up several other .gyp files too.

[xhwang, 2014/03/05 21:52:33]

Since we have a lot of places like this. I'll investigate this in a separate CL.

+      ],
       'conditions': [
         ['arm_neon==1', {
           'defines': [
             'USE_NEON'
           ],
         }],
         ['media_use_ffmpeg==1', {
           'dependencies': [
             '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
           ],
@@ skipping 509 matching lines @@
             'base/android/media_source_player.cc',
             'base/android/media_source_player.h',
             'base/android/video_decoder_job.cc',
             'base/android/video_decoder_job.h',
             'base/android/webaudio_media_codec_bridge.cc',
             'base/android/webaudio_media_codec_bridge.h',
             'base/android/webaudio_media_codec_info.h',
           ],
           'dependencies': [
             '../base/base.gyp:base',
+            '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h',

[xhwang, 2014/03/04 00:18:58]

ditto

             '../ui/gl/gl.gyp:gl',
             '../url/url.gyp:url_lib',
             'media_android_jni_headers',
           ],
+          'include_dirs': [
+            # Needed by media_drm_bridge.cc.
+            '<(SHARED_INTERMEDIATE_DIR)',
+          ],
           'defines': [
             'MEDIA_IMPLEMENTATION',
           ],
         },
         {
           'target_name': 'media_java',
           'type': 'none',
           'dependencies': [
             '../base/base.gyp:base',
             'media_android_imageformat_list',
@@ skipping 82 matching lines @@
                   ],
                 }],
               ],
             }],
           ],
         },
       ],
     }],
   ],
 }