From d7cd9243b031843d8386e6b4ec592fa185bd2637 Mon Sep 17 00:00:00 2001 From: Joey Parrish Date: Wed, 2 Jul 2014 14:57:20 -0700 Subject: [PATCH] Revert properties_source_file change. We broke the Chromecast build with our recent Roku changes. Cherry-picked from upstream. Change-Id: I7838d10b2ad0ef8b93d8b8510e96e7d4cfa2596a --- README.upgrading | 3 --- cdm/cdm.gyp | 2 +- platforms/global_config.gypi | 1 - 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/README.upgrading b/README.upgrading index cb28c75c..fc81ea76 100644 --- a/README.upgrading +++ b/README.upgrading @@ -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 diff --git a/cdm/cdm.gyp b/cdm/cdm.gyp index b5ce8906..c58c94e6 100644 --- a/cdm/cdm.gyp +++ b/cdm/cdm.gyp @@ -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', diff --git a/platforms/global_config.gypi b/platforms/global_config.gypi index 9acf1c0a..4204f20a 100644 --- a/platforms/global_config.gypi +++ b/platforms/global_config.gypi @@ -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