Index: chrome/chrome_dll_bundle.gypi |
diff --git a/chrome/chrome_dll_bundle.gypi b/chrome/chrome_dll_bundle.gypi |
index 5b49c215afaa1659644dae695673cbc7356dd7df..40f0f311be0c372a00c352e9fbcb962e68e3a0f9 100644 |
--- a/chrome/chrome_dll_bundle.gypi |
+++ b/chrome/chrome_dll_bundle.gypi |
@@ -136,27 +136,19 @@ |
}, |
{ |
# The adapter is not a complete library on its own. It needs the Widevine |
- # CDM to work. |
+ # CDM to work. The CDM and manifest are either the actual Widevine CDM |
+ # and manifest or stubs used for testing only. The choice is made within |
+ # the corresponding Widevine targets based on branding. |
'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Libraries/<(widevine_cdm_path)', |
- 'files': [], |
- 'conditions': [ |
- ['branding == "Chrome"', { |
- 'files': [ |
- '<(PRODUCT_DIR)/<(widevine_cdm_path)/libwidevinecdm.dylib', |
- '<(PRODUCT_DIR)/<(widevine_cdm_path)/widevinecdmadapter.plugin', |
- ], |
- }], |
+ 'files': [ |
ddorwin
2016/07/18 18:35:17
Don't we still need a condition for Chrome || enab
wdzierzanowski
2016/07/19 11:35:17
Ah, of course. Thanks for catching it!
wdzierzanowski
2016/07/19 11:35:17
Done.
|
+ '<(PRODUCT_DIR)/<(widevine_cdm_path)/libwidevinecdm.dylib', |
ddorwin
2016/07/18 18:35:17
It's not clear to me that putting the stub CDM or
wdzierzanowski
2016/07/19 11:35:17
You're right, this must not be shipped.
I'm a bit
wdzierzanowski
2016/07/21 08:47:06
I feel like I need to clarify some bits of what I
|
+ '<(PRODUCT_DIR)/<(widevine_cdm_path)/widevinecdmadapter.plugin', |
], |
}, |
{ |
'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Libraries/WidevineCdm', |
- 'files': [], |
- 'conditions': [ |
- ['branding == "Chrome"', { |
- 'files': [ |
- '<(PRODUCT_DIR)/WidevineCdm/manifest.json', |
- ], |
- }], |
+ 'files': [ |
+ '<(PRODUCT_DIR)/WidevineCdm/manifest.json', |
], |
}, |
{ |