Source release 17.1.1

cdm/cdm.gyp

@@ -2,10 +2,9 @@
 # source code may only be used and distributed under the Widevine License
 # Agreement.
 #
-# Refer to the distribution package's integration guide
-# (Widevine_CE_CDM_IntegrationGuide_x.x.x.pdf) for information about
-# setting up your system, performing the build, and using/testing
-# the build targets.
+# Refer to the distribution package's integration guide for information about
+# setting up your system, performing the build, and using/testing the build
+# targets.
 
 {
   'includes': [
@@ -15,6 +14,7 @@
   ],    # Get list of core source files.
   'variables': {
     'has_dual_key%': 'false',
+    'embedded_cert%': '',
   },
   'targets': [
     {
@@ -86,9 +86,6 @@
         '../third_party/jsmn',
         '../util/include',
       ],
-      'defines': [
-        'CORE_UTIL_IMPLEMENTATION',
-      ],
       'direct_dependent_settings': {
         'include_dirs': [
           '../core/include',
@@ -104,6 +101,40 @@
       ],
       'includes': [ '../util/libcrypto_dependency.gypi' ],
       'conditions': [
+        ['client_info_source=="compiled"', {
+          'conditions': [
+            ['client_company_name=="" or " | " in client_company_name or "%" in client_company_name', {
+              'sources': [ 'invalid_client_company_name.c' ],
+            }],
+            ['client_model_name=="" or " | " in client_model_name or "%" in client_model_name', {
+              'sources': [ 'invalid_client_model_name.c' ],
+            }],
+            # year may be a number, so use __str__ to convert to string.  Can't use
+            # str() since we can't use global functions.
+            ['client_model_year=="" or " | " in client_model_year.__str__() or "%" in client_model_year.__str__()', {
+              'sources': [ 'invalid_client_model_year.c' ],
+            }],
+            ['client_product_name=="" or " | " in client_product_name or "%" in client_product_name', {
+              'sources': [ 'invalid_client_product_name.c' ],
+            }],
+            ['client_device_name=="" or " | " in client_device_name or "%" in client_device_name', {
+              'sources': [ 'invalid_client_device_name.c' ],
+            }],
+            ['client_arch_name=="" or " | " in client_arch_name or "%" in client_arch_name', {
+              'sources': [ 'invalid_client_arch_name.c' ],
+            }],
+            ['client_platform=="" or " | " in client_platform or "%" in client_platform', {
+              'sources': [ 'invalid_client_platform.c' ],
+            }],
+            ['client_form_factor=="" or " | " in client_form_factor or "%" in client_form_factor', {
+              'sources': [ 'invalid_client_form_factor.c' ],
+            }],
+            ['client_version=="" or " | " in client_version or "%" in client_version', {
+              'sources': [ 'invalid_client_version.c' ],
+            }],
+          ],
+        }],
+
         ['privacy_crypto_impl=="boringssl" or privacy_crypto_impl=="openssl"', {
           'sources': [
             '../core/src/privacy_crypto_boringssl.cpp',
@@ -173,7 +204,6 @@
       ],
       'defines': [
         'CDM_IMPLEMENTATION',
-        'CORE_UTIL_IMPLEMENTATION',
       ],
       'include_dirs': [
         'include',
@@ -191,6 +221,60 @@
         'src/log.cpp',
         'src/properties_ce.cpp',
       ],
+      'conditions': [
+        ['embedded_cert!=""', {
+          'actions': [{
+            'action_name': 'generate_cert',
+            'msvs_cygwin_shell': 0,
+            'message': 'Generating cert.cc',
+            'inputs': [
+              'create_cert_cc.py',
+              '<(embedded_cert)',
+            ],
+            'outputs': [
+              '<(INTERMEDIATE_DIR)/cert.cc',
+            ],
+            'action': [
+              'python3',
+              '>@(_inputs)',
+              '>@(_outputs)',
+            ],
+          }],
+          'sources': [
+            '<(INTERMEDIATE_DIR)/cert.cc',
+          ],
+          'defines': ['HAS_EMBEDDED_CERT'],
+        }],  # embedded_cert!=""
+
+        # This block defines preprocessor values that match the client
+        # information variables in platform properties.gypi. If you are writing
+        # your own build files to build CE CDM insted of using these GYP files
+        # and you are using compile-time client info, make sure to define these
+        # values, following the rules in the client info section in
+        # platform_properties.gypi.
+        ['client_info_source=="compiled"', {
+          'defines': [
+            'CLIENT_COMPANY_NAME="<(client_company_name)"',
+            'CLIENT_MODEL_NAME="<(client_model_name)"',
+            'CLIENT_MODEL_YEAR="<(client_model_year)"',
+            'CLIENT_PRODUCT_NAME="<(client_product_name)"',
+            'CLIENT_DEVICE_NAME="<(client_device_name)"',
+            'CLIENT_ARCH_NAME="<(client_arch_name)"',
+            'CLIENT_PLATFORM="<(client_platform)"',
+            'CLIENT_FORM_FACTOR="<(client_form_factor)"',
+            'CLIENT_VERSION="<(client_version)"',
+          ],
+        }],  # client_info_source=="compiled"
+
+        ['client_info_source=="runtime"', {
+          'defines': [
+            'RUNTIME_CLIENT_INFO',
+          ],
+          'dependencies': [
+            '<(read_client_info_path)',
+          ],
+        }],  # client_info_source=="runtime"
+      ],  # conditions
     },  # widevine_cdm_static target
     {
       'toolsets' : [  'target' ],