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

Side by Side 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, 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/common/chrome_paths.cc » ('j') | chrome/common/chrome_paths.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
177 'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Internet Plug-Ins/P epperFlash', 177 'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Internet Plug-Ins/P epperFlash',
178 'files': [], 178 'files': [],
179 'conditions': [ 179 'conditions': [
180 ['branding == "Chrome"', { 180 ['branding == "Chrome"', {
181 'files': [ 181 'files': [
182 '<(PRODUCT_DIR)/PepperFlash/PepperFlashPlayer.plugin', 182 '<(PRODUCT_DIR)/PepperFlash/PepperFlashPlayer.plugin',
183 ], 183 ],
184 }], 184 }],
185 ], 185 ],
186 }, 186 },
187 # TODO(ddorwin): Include CDM files in the Mac bundle. 187 {
188 # This file is used by the component installer.
189 # It is not a complete plug-in on its own.
190 'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Internet Plug-Ins/' ,
191 'files': [],
192 'conditions': [
193 ['branding == "Chrome"', {
194 'files': [
195 '<(PRODUCT_DIR)/widevinecdmadapter.plugin',
196 ],
197 }],
198 ],
199 },
188 { 200 {
189 # Copy of resources used by tests. 201 # Copy of resources used by tests.
190 'destination': '<(PRODUCT_DIR)', 202 'destination': '<(PRODUCT_DIR)',
191 'files': [ 203 'files': [
192 '<(SHARED_INTERMEDIATE_DIR)/repack/resources.pak' 204 '<(SHARED_INTERMEDIATE_DIR)/repack/resources.pak'
193 ], 205 ],
194 }, 206 },
195 { 207 {
196 # Copy of resources used by tests. 208 # Copy of resources used by tests.
197 'destination': '<(PRODUCT_DIR)/pseudo_locales', 209 'destination': '<(PRODUCT_DIR)/pseudo_locales',
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
292 ['enable_webrtc==1 and libpeer_target_type!="static_library"', { 304 ['enable_webrtc==1 and libpeer_target_type!="static_library"', {
293 'copies': [{ 305 'copies': [{
294 'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Libraries', 306 'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Libraries',
295 'files': [ 307 'files': [
296 '<(PRODUCT_DIR)/libpeerconnection.so', 308 '<(PRODUCT_DIR)/libpeerconnection.so',
297 ], 309 ],
298 }], 310 }],
299 }], 311 }],
300 ], # conditions 312 ], # conditions
301 } 313 }
OLDNEW
« 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