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

Side by Side Diff: chrome/chrome_dll_bundle.gypi

Issue 899033002: Revert of Combine PDF plugin into the Chromium binary. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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_dll.gypi ('k') | chrome/chrome_exe.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 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 # common.gypi for more info. 69 # common.gypi for more info.
70 ], 70 ],
71 'mac_bundle_resources!': [ 71 'mac_bundle_resources!': [
72 'app/framework-Info.plist', 72 'app/framework-Info.plist',
73 ], 73 ],
74 'dependencies': [ 74 'dependencies': [
75 'app_mode_app', 75 'app_mode_app',
76 # Bring in pdfsqueeze and run it on all pdfs 76 # Bring in pdfsqueeze and run it on all pdfs
77 '../build/temp_gyp/pdfsqueeze.gyp:pdfsqueeze', 77 '../build/temp_gyp/pdfsqueeze.gyp:pdfsqueeze',
78 '../crypto/crypto.gyp:crypto', 78 '../crypto/crypto.gyp:crypto',
79 '../pdf/pdf.gyp:pdf',
79 # On Mac, Flash gets put into the framework, so we need this 80 # On Mac, Flash gets put into the framework, so we need this
80 # dependency here. flash_player.gyp will copy the Flash bundle 81 # dependency here. flash_player.gyp will copy the Flash bundle
81 # into PRODUCT_DIR. 82 # into PRODUCT_DIR.
82 '../third_party/adobe/flash/flash_player.gyp:flapper_binaries', 83 '../third_party/adobe/flash/flash_player.gyp:flapper_binaries',
83 '../third_party/widevine/cdm/widevine_cdm.gyp:widevinecdmadapter', 84 '../third_party/widevine/cdm/widevine_cdm.gyp:widevinecdmadapter',
84 'chrome_resources.gyp:packed_extra_resources', 85 'chrome_resources.gyp:packed_extra_resources',
85 'chrome_resources.gyp:packed_resources', 86 'chrome_resources.gyp:packed_resources',
86 ], 87 ],
87 'rules': [ 88 'rules': [
88 { 89 {
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 'copies': [ 140 'copies': [
140 { 141 {
141 'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Libraries', 142 'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Libraries',
142 'files': [ 143 'files': [
143 '<(PRODUCT_DIR)/exif.so', 144 '<(PRODUCT_DIR)/exif.so',
144 '<(PRODUCT_DIR)/ffmpegsumo.so', 145 '<(PRODUCT_DIR)/ffmpegsumo.so',
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',
150 'files': [
151 '<(PRODUCT_DIR)/PDF.plugin',
152 ],
149 'conditions': [ 153 'conditions': [
150 ['disable_nacl!=1', { 154 ['disable_nacl!=1', {
151 'conditions': [ 155 'conditions': [
152 ['target_arch=="x64"', { 156 ['target_arch=="x64"', {
153 'files': [ 157 'files': [
154 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe', 158 '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe',
155 ], 159 ],
156 }, { 160 }, {
157 'files': [ 161 'files': [
158 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe', 162 '<(PRODUCT_DIR)/nacl_irt_x86_32.nexe',
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
299 ], 303 ],
300 }], 304 }],
301 ['v8_use_external_startup_data==1', { 305 ['v8_use_external_startup_data==1', {
302 'mac_bundle_resources': [ 306 'mac_bundle_resources': [
303 '<(PRODUCT_DIR)/natives_blob.bin', 307 '<(PRODUCT_DIR)/natives_blob.bin',
304 '<(PRODUCT_DIR)/snapshot_blob.bin', 308 '<(PRODUCT_DIR)/snapshot_blob.bin',
305 ], 309 ],
306 }], 310 }],
307 ], # conditions 311 ], # conditions
308 } 312 }
OLDNEW
« no previous file with comments | « chrome/chrome_dll.gypi ('k') | chrome/chrome_exe.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698