Source release v2.1.5-0-811 + third_party libs

Change-Id: Ic8eafba071e486e671257bc22a8208e86d68b08a

cdm/cdm.gyp

@@ -4,8 +4,6 @@
 # setting up your system, performing the build, and using/testing
 # the build targets.
 
-# Set external_build=0 via GYP_DEFINES if debug information in
-# libwvcdm_shared.so is desirable.
 {
   'targets': [
     {
@@ -14,7 +12,6 @@
       'sources': ['../core/src/license_protocol.proto',],
       'variables': {
         'proto_in_dir': '../core/src',
-        'proto_out_dir': 'license_protocol',
       },
       'includes': ['../third_party/protoc.gypi'],
     },
@@ -24,7 +21,6 @@
       'sources': ['../core/src/device_files.proto',],
       'variables': {
         'proto_in_dir': '../core/src',
-        'proto_out_dir': 'device_files',
       },
       'includes': ['../third_party/protoc.gypi'],
     },
@@ -57,10 +53,15 @@
         'wvcdm_sysdep',
         '<(oemcrypto_target)',
       ],
+      # 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',
+      ],
       'include_dirs': [
         '../cdm/include',
         '../core/include',
-        '../third_party/gmock/include',
         '../linux/include',
         '../oemcrypto/include',
       ],
@@ -99,13 +100,6 @@
             '../core/src/oemcrypto_adapter_static_v8.cpp',
           ],
         }],
-        ['use_system_protobuf=="true"', {
-          'direct_dependent_settings': {
-            'libraries': [
-              '-lprotobuf',
-            ],
-          },
-        }],
       ],
     },
     {

cdm/include/wv_cdm_version.h

@@ -1,3 +1,3 @@
 // Widevine CDM Kit Version
- #define WV_CDM_VERSION "v2.1.4-0-804"
+ #define WV_CDM_VERSION "v2.1.5-0-811"