widevine-partner/ce_cdm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert properties_source_file change.

Browse Source 
We broke the Chromecast build with our recent Roku changes.

Cherry-picked from upstream.

Change-Id: I7838d10b2ad0ef8b93d8b8510e96e7d4cfa2596a
This commit is contained in:
Joey Parrish
2014-07-02 14:57:20 -07:00
parent 334525c8a5
commit d7cd9243b0
3 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
README.upgrading
View File

@@ -12,9 +12,6 @@ You may override these defaults in your platform-specific gypi.
New in v2.1.4: New in v2.1.4:
===== =====
New gyp variables have been introduced to make the build more configurable: New gyp variables have been introduced to make the build more configurable:
* properties_source_file
Allows the file cdm/src/properties_common.cpp to be replaced with a
platform-specific version.
* protobuf_gyp * protobuf_gyp
For gyp-based projects with their own internal version of protobuf, allows For gyp-based projects with their own internal version of protobuf, allows
the path to the protobuf gyp file to be overridden. The default is the path to the protobuf gyp file to be overridden. The default is

2
cdm/cdm.gyp
View File

@@ -39,8 +39,8 @@
'../third_party/stringencoders/src', '../third_party/stringencoders/src',
], ],
'sources': [ 'sources': [
'<(properties_source_file)',
'../cdm/src/file_store.cpp', '../cdm/src/file_store.cpp',
'../cdm/src/properties_common.cpp',
'../core/src/string_conversions.cpp', '../core/src/string_conversions.cpp',
'../linux/src/lock.cpp', '../linux/src/lock.cpp',
'../linux/src/log.cpp', '../linux/src/log.cpp',

1
platforms/global_config.gypi
View File

@@ -18,7 +18,6 @@
'certificate_provision%': 'false', 'certificate_provision%': 'false',
'force_use_of_secure_buffers%': 'false', 'force_use_of_secure_buffers%': 'false',
'disable_privacy_crypto%': 'false', 'disable_privacy_crypto%': 'false',
'properties_source_file%': 'src/properties_common.cpp',
'protobuf_gyp%': '<(DEPTH)/third_party/protobuf.gyp', 'protobuf_gyp%': '<(DEPTH)/third_party/protobuf.gyp',
}, # end variables }, # end variables