Source release v3.5.0

cdm/cdm.gyp

@@ -8,7 +8,7 @@
 {
   'variables': {
     # Override if you intend to link against a different OEMCrypto API version.
-    'oemcrypto_version%': 12,
+    'oemcrypto_version%': 13,
 
     # Override if you can't depend on OpenSSL for privacy features.
     # If set to 'dummy', privacy mode in the CDM will fail.
@@ -42,11 +42,11 @@
     # 3) protobuf_config == 'source'  (default)
     # Build protobuf and protoc from source.
     # Specify the path to the protobuf source in protobuf_source.
-    # Make sure that a valid config.h for your target is in the source tree.
     'protobuf_config%': 'source',
     'protobuf_source%': '../third_party/protobuf',
     'protoc_host_target%': 'dummy',
   },  # variables
+  'includes': ['core.gypi'],    # Get list of core source files.
   'conditions': [
     ['protobuf_config=="source"', {
       # Include protobuf targets used by protobuf_config=='source'
@@ -58,23 +58,33 @@
       'target_name': 'license_protocol',
       'type': 'static_library',
       'standalone_static_library': 1,
+      'includes': ['../third_party/protoc.gypi'],
       'sources': [
         '../core/src/license_protocol.proto',
       ],
       'variables': {
         'proto_in_dir': '../core/src',
       },
-      'includes': ['../third_party/protoc.gypi'],
     },
     {
       'target_name': 'device_files',
       'type': 'static_library',
       'standalone_static_library': 1,
+      'includes': ['../third_party/protoc.gypi'],
       'sources': ['../core/src/device_files.proto',],
       'variables': {
         'proto_in_dir': '../core/src',
       },
+    },
+    {
+      'target_name': 'metrics_proto',
+      'type': 'static_library',
+      'standalone_static_library': 1,
       'includes': ['../third_party/protoc.gypi'],
+      'sources': ['../metrics/src/metrics.proto',],
+      'variables': {
+        'proto_in_dir': '../metrics/src',
+      },
     },
     {
       'target_name': 'widevine_cdm_core',
@@ -83,71 +93,29 @@
       'dependencies': [
         'device_files',
         'license_protocol',
+        'metrics_proto',
       ],
       'include_dirs': [
         '../core/include',
+        '../metrics/include',
         '../oemcrypto/include',
         '../third_party/jsmn',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
           '../core/include',
+          '../metrics/include',
           '../oemcrypto/include',
         ],
       },
       'sources': [
-        '../core/include/buffer_reader.h',
-        '../core/include/cdm_client_property_set.h',
-        '../core/include/cdm_engine.h',
-        '../core/include/cdm_session.h',
-        '../core/include/cdm_session_map.h',
-        '../core/include/certificate_provisioning.h',
-        '../core/include/clock.h',
-        '../core/include/crypto_key.h',
-        '../core/include/crypto_session.h',
-        '../core/include/device_files.h',
-        '../core/include/file_store.h',
-        '../core/include/initialization_data.h',
-        '../core/include/license_key_status.h',
-        '../core/include/license.h',
-        '../core/include/lock.h',
-        '../core/include/log.h',
-        '../core/include/oemcrypto_adapter.h',
-        '../core/include/policy_engine.h',
-        '../core/include/privacy_crypto.h',
-        '../core/include/properties.h',
-        '../core/include/scoped_ptr.h',
-        '../core/include/service_certificate.h',
-        '../core/include/string_conversions.h',
-        '../core/include/wv_cdm_constants.h',
-        '../core/include/wv_cdm_event_listener.h',
-        '../core/include/wv_cdm_types.h',
-        '../core/src/buffer_reader.cpp',
-        '../core/src/cdm_engine.cpp',
-        '../core/src/cdm_session.cpp',
-        '../core/src/cdm_session_map.cpp',
-        '../core/src/certificate_provisioning.cpp',
-        '../core/src/crypto_session.cpp',
-        '../core/src/device_files.cpp',
-        '../core/src/initialization_data.cpp',
-        '../core/src/license_key_status.cpp',
-        '../core/src/license.cpp',
+        '<@(wvcdm_sources)',
         '../core/src/oemcrypto_adapter_static.cpp',
-        '../core/src/policy_engine.cpp',
         '../core/src/privacy_crypto_<(privacy_crypto_impl).cpp',
-        '../core/src/properties.cpp',
-        '../core/src/service_certificate.cpp',
-        '../core/src/string_conversions.cpp',
         '../third_party/jsmn/jsmn.h',
         '../third_party/jsmn/jsmn.c',
       ],
       'conditions': [
-        ['oemcrypto_version < 9', {
-          'sources': [
-            # Include APIs introduced in v9.
-            '../core/src/oemcrypto_adapter_static_v9.cpp',
-          ],
-        }],
         ['oemcrypto_version < 10', {
           'sources': [
             # Include APIs introduced in v10.
@@ -166,6 +134,12 @@
             '../core/src/oemcrypto_adapter_static_v12.cpp',
           ],
         }],
+        ['oemcrypto_version < 13', {
+          'sources': [
+            # Include APIs introduced in v13.
+            '../core/src/oemcrypto_adapter_static_v13.cpp',
+          ],
+        }],
         ['privacy_crypto_impl=="openssl"', {
           'conditions': [
             ['openssl_config == "target"', {
@@ -192,12 +166,14 @@
         'widevine_cdm_core',
         'device_files',
         'license_protocol',
+        'metrics_proto',
       ],
       # Without this, library deps do not propagate from the protocol targets
       # up to the shared lib or executable above.
       'export_dependent_settings': [
         'device_files',
         'license_protocol',
+        'metrics_proto',
       ],
       'defines': ['CDM_IMPLEMENTATION'],
       'include_dirs': [