Source release v3.0.5

This commit is contained in:
Joey Parrish
2015-12-16 10:08:48 -08:00
parent 973eb25a17
commit 7a7f78d654
11 changed files with 118 additions and 72 deletions

View File

@@ -13,6 +13,18 @@
# If set to 'dummy', privacy mode in the CDM will fail.
'privacy_crypto_impl%': 'openssl',
# There are two openssl configurations:
#
# 1) openssl_config == 'system'
# Use the openssl headers found in the sysroot and link the system library.
#
# 2) openssl_config == 'target'
# Use the openssl implementation in an existing GYP target.
# Specify the openssl target in openssl_target. This target should forward
# the include path to its headers to its dependents.
'openssl_config%': 'system',
'openssl_target%': '',
# There are three protobuf configurations:
#
# 1) protobuf_config == 'system'
@@ -136,8 +148,24 @@
'../core/src/oemcrypto_adapter_static_v10.cpp',
],
}],
],
},
['privacy_crypto_impl=="openssl"', {
'conditions': [
['openssl_config == "target"', {
'dependencies': [
'<(openssl_target)',
],
}, {
# openssl_config == "system"
'link_settings': {
'libraries': [
'-lcrypto',
],
},
}],
], # conditions
}], # privacy_crypto_impl=="openssl"
], # conditions
}, # widevine_cdm_core target
{
'target_name': 'widevine_ce_cdm_static',
'type': 'static_library',
@@ -177,7 +205,7 @@
'src/log.cpp',
'src/properties_ce.cpp',
],
},
}, # widevine_cdm_static target
{
'target_name': 'widevine_ce_cdm_shared',
'type': 'shared_library',