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

Side by Side Diff: chrome/chrome_dll_bundle.gypi

Issue 2000513002: media: Bundle Widevine CDM on Win/Mac. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more fixes Created 4 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 unified diff | Download patch
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 # This file contains resources for the main Mac chromium bundle. 5 # This file contains resources for the main Mac chromium bundle.
6 { 6 {
7 # The main browser executable's name is <(mac_product_name). 7 # The main browser executable's name is <(mac_product_name).
8 # Certain things will get confused if two modules in the 8 # Certain things will get confused if two modules in the
9 # executable share the same name, so append " Framework" to the 9 # executable share the same name, so append " Framework" to the
10 # product_name used for the framework. This will result in 10 # product_name used for the framework. This will result in
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 ['branding == "Chrome"', { 128 ['branding == "Chrome"', {
129 'files': [ 129 'files': [
130 '<(PRODUCT_DIR)/PepperFlash/PepperFlashPlayer.plugin', 130 '<(PRODUCT_DIR)/PepperFlash/PepperFlashPlayer.plugin',
131 ], 131 ],
132 }], 132 }],
133 ], 133 ],
134 }, 134 },
135 { 135 {
136 # The adapter is not a complete library on its own. It needs the Widevine 136 # The adapter is not a complete library on its own. It needs the Widevine
137 # CDM to work. 137 # CDM to work.
138 'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Libraries/<(widevin e_cdm_path)', 138 'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Libraries/<(widevin e_cdm_path)',
ddorwin 2016/05/20 21:37:22 Given the presence of "WidevineCdm" below (and nee
xhwang 2016/05/20 23:46:11 Yes for the future. For now, the tricky part is th
139 'files': [], 139 'files': [],
140 'conditions': [ 140 'conditions': [
141 ['branding == "Chrome"', { 141 ['branding == "Chrome"', {
142 'files': [ 142 'files': [
143 '<(PRODUCT_DIR)/<(widevine_cdm_path)/widevinecdmadapter.plugin', 143 '<(PRODUCT_DIR)/<(widevine_cdm_path)/widevinecdmadapter.plugin',
144 '<(PRODUCT_DIR)/<(widevine_cdm_path)/libwidevinecdm.dylib',
144 ], 145 ],
145 }], 146 }],
146 ], 147 ],
148 },
149 {
150 'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Libraries/WidevineC dm',
151 'files': [],
152 'conditions': [
153 ['branding == "Chrome"', {
154 'files': [
155 '<(PRODUCT_DIR)/WidevineCdm/manifest.json',
156 ],
157 }],
158 ],
147 }, 159 },
148 { 160 {
149 # Copy of resources used by tests. 161 # Copy of resources used by tests.
150 'destination': '<(PRODUCT_DIR)/pseudo_locales', 162 'destination': '<(PRODUCT_DIR)/pseudo_locales',
151 'files': [ 163 'files': [
152 '<(SHARED_INTERMEDIATE_DIR)/<(pseudo_locales).pak' 164 '<(SHARED_INTERMEDIATE_DIR)/<(pseudo_locales).pak'
153 ], 165 ],
154 }, 166 },
155 { 167 {
156 'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Resources', 168 'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Resources',
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
249 ], 261 ],
250 }], 262 }],
251 ['v8_use_external_startup_data==1', { 263 ['v8_use_external_startup_data==1', {
252 'mac_bundle_resources': [ 264 'mac_bundle_resources': [
253 '<(PRODUCT_DIR)/natives_blob.bin', 265 '<(PRODUCT_DIR)/natives_blob.bin',
254 '<(PRODUCT_DIR)/snapshot_blob.bin', 266 '<(PRODUCT_DIR)/snapshot_blob.bin',
255 ], 267 ],
256 }], 268 }],
257 ], # conditions 269 ], # conditions
258 } 270 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698