Revert properties_source_file change.
We broke the Chromecast build with our recent Roku changes. Cherry-picked from upstream. Change-Id: I7838d10b2ad0ef8b93d8b8510e96e7d4cfa2596a
This commit is contained in:
@@ -12,9 +12,6 @@ You may override these defaults in your platform-specific gypi.
|
||||
New in v2.1.4:
|
||||
=====
|
||||
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
|
||||
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
|
||||
|
||||
@@ -39,8 +39,8 @@
|
||||
'../third_party/stringencoders/src',
|
||||
],
|
||||
'sources': [
|
||||
'<(properties_source_file)',
|
||||
'../cdm/src/file_store.cpp',
|
||||
'../cdm/src/properties_common.cpp',
|
||||
'../core/src/string_conversions.cpp',
|
||||
'../linux/src/lock.cpp',
|
||||
'../linux/src/log.cpp',
|
||||
|
||||
@@ -18,7 +18,6 @@
|
||||
'certificate_provision%': 'false',
|
||||
'force_use_of_secure_buffers%': 'false',
|
||||
'disable_privacy_crypto%': 'false',
|
||||
'properties_source_file%': 'src/properties_common.cpp',
|
||||
'protobuf_gyp%': '<(DEPTH)/third_party/protobuf.gyp',
|
||||
}, # end variables
|
||||
|
||||
|
||||
Reference in New Issue
Block a user