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

Side by Side Diff: chrome/chrome_dll_bundle.gypi

Issue 1161183003: Revert "Chromium changes to statically link ffmpeg." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 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
« no previous file with comments | « chrome/chrome.isolate ('k') | chrome/chrome_installer.gypi » ('j') | no next file with comments »
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 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 'Versions/Current/Libraries', 129 'Versions/Current/Libraries',
130 '${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME}/Libraries' 130 '${BUILT_PRODUCTS_DIR}/${WRAPPER_NAME}/Libraries'
131 ], 131 ],
132 }, 132 },
133 ], 133 ],
134 'copies': [ 134 'copies': [
135 { 135 {
136 'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Libraries', 136 'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Libraries',
137 'files': [ 137 'files': [
138 '<(PRODUCT_DIR)/exif.so', 138 '<(PRODUCT_DIR)/exif.so',
139 '<(PRODUCT_DIR)/ffmpegsumo.so',
139 ], 140 ],
140 }, 141 },
141 { 142 {
142 'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Helpers', 143 'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Helpers',
143 'files': [ 144 'files': [
144 '<(PRODUCT_DIR)/crashpad_handler', 145 '<(PRODUCT_DIR)/crashpad_handler',
145 ], 146 ],
146 }, 147 },
147 { 148 {
148 'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Internet Plug-Ins', 149 'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Internet Plug-Ins',
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
285 ], 286 ],
286 }], 287 }],
287 ['v8_use_external_startup_data==1', { 288 ['v8_use_external_startup_data==1', {
288 'mac_bundle_resources': [ 289 'mac_bundle_resources': [
289 '<(PRODUCT_DIR)/natives_blob.bin', 290 '<(PRODUCT_DIR)/natives_blob.bin',
290 '<(PRODUCT_DIR)/snapshot_blob.bin', 291 '<(PRODUCT_DIR)/snapshot_blob.bin',
291 ], 292 ],
292 }], 293 }],
293 ], # conditions 294 ], # conditions
294 } 295 }
OLDNEW
« no previous file with comments | « chrome/chrome.isolate ('k') | chrome/chrome_installer.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698