Source release 16.3.0

cdm/cdm.gyp

@@ -52,6 +52,14 @@
         'proto_in_dir': '../metrics/src',
       },
     },
+    {
+      'target_name': 'widevine_utils',
+      'type': 'static_library',
+      'include_dirs': [
+        '../util/include',
+      ],
+      'sources': [ '<@(wvutil_sources)'],
+    },
     {
       'target_name': 'widevine_cdm_core',
       'type': 'static_library',
@@ -60,6 +68,7 @@
         'device_files',
         'license_protocol',
         'metrics_proto',
+        'widevine_utils',
       ],
       'include_dirs': [
         '../core/include',
@@ -82,8 +91,6 @@
       },
       'sources': [
         '<@(wvcdm_sources)',
-        '<@(wvutil_sources)',
-        '../core/src/oemcrypto_adapter_static.cpp',
         '../third_party/jsmn/jsmn.h',
         '../third_party/jsmn/jsmn.c',
       ],
@@ -98,9 +105,29 @@
             '../core/src/privacy_crypto_<(privacy_crypto_impl).cpp',
           ],
         }],  # end else
+        ['oemcrypto_adapter_type=="dynamic"', {
+          'sources': [
+            '../core/src/oemcrypto_adapter_dynamic.cpp',
+          ],
+        }],
+        ['oemcrypto_adapter_type=="static"', {
+          'sources': [
+          '../core/src/oemcrypto_adapter_static.cpp',
+          ],
+        }],
+        # TODO(b/139814713): For testing and internal use only.
+        ['oemcrypto_adapter_type=="static_v15"', {
+          'sources': [
+            '../core/src/oemcrypto_adapter_static.cpp',
+            '../core/src/oemcrypto_adapter_static_v16.cpp',
+          ],
+        }],
       ],
     },  # widevine_cdm_core target
     {
+      # This is the widevine_ce_cdm built as a static library. This name does
+      # not mean that it uses oemcrypto's static adapter. Control over which
+      # adapter is used comes from the settings file for the platform.
       'target_name': 'widevine_ce_cdm_static',
       'type': 'static_library',
       'standalone_static_library': 1,