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

Side by Side Diff: chrome/chrome_dll_bundle.gypi

Issue 1957643002: media: Move widevine CDM targets to WidevineCdm folder (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Also update stub cdm. 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 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 'files': [], 125 'files': [],
126 'conditions': [ 126 'conditions': [
127 ['branding == "Chrome"', { 127 ['branding == "Chrome"', {
128 'files': [ 128 'files': [
129 '<(PRODUCT_DIR)/PepperFlash/PepperFlashPlayer.plugin', 129 '<(PRODUCT_DIR)/PepperFlash/PepperFlashPlayer.plugin',
130 ], 130 ],
131 }], 131 }],
132 ], 132 ],
133 }, 133 },
134 { 134 {
135 # This file is used by the component installer. 135 # This file is used by the component installer.
ddorwin 2016/05/06 22:23:48 This comment is misleading. The important part is
xhwang 2016/05/09 20:59:03 Updated.
136 # It is not a complete plugin on its own. 136 # It is not a complete plugin on its own.
137 'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Internet Plug-Ins/' , 137 'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Internet Plug-Ins/W idevineCdm',
138 'files': [], 138 'files': [],
139 'conditions': [ 139 'conditions': [
140 ['branding == "Chrome"', { 140 ['branding == "Chrome"', {
141 'files': [ 141 'files': [
142 '<(PRODUCT_DIR)/widevinecdmadapter.plugin', 142 '<(PRODUCT_DIR)/WidevineCdm/widevinecdmadapter.plugin',
143 ], 143 ],
144 }], 144 }],
145 ], 145 ],
146 }, 146 },
147 { 147 {
148 # Copy of resources used by tests. 148 # Copy of resources used by tests.
149 'destination': '<(PRODUCT_DIR)/pseudo_locales', 149 'destination': '<(PRODUCT_DIR)/pseudo_locales',
150 'files': [ 150 'files': [
151 '<(SHARED_INTERMEDIATE_DIR)/<(pseudo_locales).pak' 151 '<(SHARED_INTERMEDIATE_DIR)/<(pseudo_locales).pak'
152 ], 152 ],
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
248 ], 248 ],
249 }], 249 }],
250 ['v8_use_external_startup_data==1', { 250 ['v8_use_external_startup_data==1', {
251 'mac_bundle_resources': [ 251 'mac_bundle_resources': [
252 '<(PRODUCT_DIR)/natives_blob.bin', 252 '<(PRODUCT_DIR)/natives_blob.bin',
253 '<(PRODUCT_DIR)/snapshot_blob.bin', 253 '<(PRODUCT_DIR)/snapshot_blob.bin',
254 ], 254 ],
255 }], 255 }],
256 ], # conditions 256 ], # conditions
257 } 257 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698