Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(105)

Unified Diff: webkit/media/webkit_media.gypi

Issue 15028015: Conditionally build support for Pepper-based CDMs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Use AppendAscii() where possible. Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webkit/media/crypto/proxy_decryptor.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/media/webkit_media.gypi
diff --git a/webkit/media/webkit_media.gypi b/webkit/media/webkit_media.gypi
index 3cf15b431c6fb44b8ec0a57c26728893fb6a9419..09c99fbd633720c3d463e77645bb88deae74e3ce 100644
--- a/webkit/media/webkit_media.gypi
+++ b/webkit/media/webkit_media.gypi
@@ -116,6 +116,12 @@
'crypto/key_systems_info.cc',
],
}],
+ ['enable_pepper_cdms != 1', {
+ 'sources!': [
+ 'crypto/ppapi_decryptor.cc',
+ 'crypto/ppapi_decryptor.h',
+ ],
+ }],
],
# TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
'msvs_disabled_warnings': [ 4267, ],
@@ -160,9 +166,10 @@
'crypto/ppapi/libvpx_cdm_video_decoder.h',
],
}],
- ['os_posix == 1 and OS != "mac"', {
+ ['os_posix == 1 and OS != "mac" and enable_pepper_cdms==1', {
'type': 'loadable_module', # Must be in PRODUCT_DIR for ASAN bots.
- }, { # 'os_posix != 1 or OS == "mac"'
+ }],
+ ['(OS == "mac" or OS == "win") and enable_pepper_cdms==1', {
'type': 'shared_library',
}],
['OS == "mac"', {
@@ -202,7 +209,7 @@
'crypto/ppapi/linked_ptr.h',
],
'conditions': [
- ['os_posix == 1 and OS != "mac"', {
+ ['os_posix == 1 and OS != "mac" and enable_pepper_cdms==1', {
'cflags': ['-fvisibility=hidden'],
'type': 'loadable_module',
# Allow the plugin wrapper to find the CDM in the same directory.
@@ -212,12 +219,12 @@
'<(PRODUCT_DIR)/libclearkeycdm.so',
],
}],
- ['OS == "win"', {
+ ['OS == "win" and enable_pepper_cdms==1', {
'type': 'shared_library',
# TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
'msvs_disabled_warnings': [ 4267, ],
}],
- ['OS == "mac"', {
+ ['OS == "mac" and enable_pepper_cdms==1', {
'type': 'loadable_module',
'product_extension': 'plugin',
'xcode_settings': {
« no previous file with comments | « webkit/media/crypto/proxy_decryptor.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698