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

Unified Diff: chrome/chrome_dll_bundle.gypi

Issue 14743002: Do not use bundles for the CDM on Mac. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Bundle the adapter for the component installer. Created 7 years, 8 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 | « no previous file | chrome/common/chrome_paths.cc » ('j') | chrome/common/chrome_paths.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_dll_bundle.gypi
diff --git a/chrome/chrome_dll_bundle.gypi b/chrome/chrome_dll_bundle.gypi
index 539db0ddb0c2606ecdb5ab484e19ddec3884da7d..9b8d1af5ea2315f712f8833800a7ce37dc231ccd 100644
--- a/chrome/chrome_dll_bundle.gypi
+++ b/chrome/chrome_dll_bundle.gypi
@@ -184,7 +184,19 @@
}],
],
},
- # TODO(ddorwin): Include CDM files in the Mac bundle.
+ {
+ # This file is used by the component installer.
+ # It is not a complete plug-in on its own.
+ 'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Internet Plug-Ins/',
+ 'files': [],
+ 'conditions': [
+ ['branding == "Chrome"', {
+ 'files': [
+ '<(PRODUCT_DIR)/widevinecdmadapter.plugin',
+ ],
+ }],
+ ],
+ },
{
# Copy of resources used by tests.
'destination': '<(PRODUCT_DIR)',
« no previous file with comments | « no previous file | chrome/common/chrome_paths.cc » ('j') | chrome/common/chrome_paths.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698