diff options
| author | ddorwin@chromium.org <ddorwin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-08 22:10:01 +0000 |
|---|---|---|
| committer | ddorwin@chromium.org <ddorwin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-08 22:10:01 +0000 |
| commit | a77fd1594421dbfe95e2052c2180c44d47350306 (patch) | |
| tree | ee6285d927f3455f7749b498a2a744e324d72031 | |
| parent | 552ef8b04b6128731cf68d234ea9da336dad99f7 (diff) | |
| download | chromium_src-a77fd1594421dbfe95e2052c2180c44d47350306.zip chromium_src-a77fd1594421dbfe95e2052c2180c44d47350306.tar.gz chromium_src-a77fd1594421dbfe95e2052c2180c44d47350306.tar.bz2 | |
Build the Widevine CDM plugin.
BUG=149772
Review URL: https://chromiumcodereview.appspot.com/11082005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@160721 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | build/all.gyp | 1 | ||||
| -rw-r--r-- | chrome/chrome_dll.gypi | 2 | ||||
| -rw-r--r-- | chrome/chrome_exe.gypi | 4 |
3 files changed, 7 insertions, 0 deletions
diff --git a/build/all.gyp b/build/all.gyp index 611208f..51596d3 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -602,6 +602,7 @@ '../cloud_print/cloud_print.gyp:cloud_print', '../remoting/remoting.gyp:remoting_webapp', '../third_party/adobe/flash/flash_player.gyp:flash_player', + '../third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm', ], 'conditions': [ ['internal_pdf', { diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi index b70ab12..9b3604b 100644 --- a/chrome/chrome_dll.gypi +++ b/chrome/chrome_dll.gypi @@ -268,6 +268,7 @@ # will also need to be put into the bundle. '../third_party/adobe/flash/flash_player.gyp:flash_player', '../third_party/adobe/flash/flash_player.gyp:flapper_binaries', + '../third_party/widevine/cdm/widevine_cdm.gyp:widevinecdmplugin', 'chrome_resources.gyp:packed_extra_resources', 'chrome_resources.gyp:packed_resources', ], @@ -381,6 +382,7 @@ }], ], }, + # TODO(ddorwin): Include CDM files in the Mac bundle. { # Copy of resources used by tests. 'destination': '<(PRODUCT_DIR)', diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi index c8527f9..1e4833a 100644 --- a/chrome/chrome_exe.gypi +++ b/chrome/chrome_exe.gypi @@ -425,6 +425,10 @@ # go inside the framework, so this dependency is in chrome_dll.gypi. '../third_party/adobe/flash/flash_player.gyp:flash_player', '../third_party/adobe/flash/flash_player.gyp:flapper_binaries', + # Copy CDM files to PRODUCT_DIR if applicable. Let the .gyp + # file decide what to do on a per-OS basis; on Mac, internal plugins + # go inside the framework, so this dependency is in chrome_dll.gypi. + '../third_party/widevine/cdm/widevine_cdm.gyp:widevinecdmplugin', ], }], ['OS=="mac" and asan==1', { |