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

Side by Side Diff: chrome/chrome.isolate

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/child/pdf_child_init.cc ('k') | chrome/chrome_dll.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) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2013 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 'conditions': [ 5 'conditions': [
6 ['OS=="linux"', { 6 ['OS=="linux"', {
7 'variables': { 7 'variables': {
8 'files': [ 8 'files': [
9 '<(PRODUCT_DIR)/libffmpegsumo.so', 9 '<(PRODUCT_DIR)/libffmpegsumo.so',
10 '<(PRODUCT_DIR)/libosmesa.so', 10 '<(PRODUCT_DIR)/libosmesa.so',
11 '<(PRODUCT_DIR)/libpdf.so',
11 ], 12 ],
12 }, 13 },
13 }], 14 }],
14 ['disable_nacl==0 and OS=="linux"', { 15 ['disable_nacl==0 and OS=="linux"', {
15 'variables': { 16 'variables': {
16 'files': [ 17 'files': [
17 '<(PRODUCT_DIR)/nacl_helper<(EXECUTABLE_SUFFIX)', 18 '<(PRODUCT_DIR)/nacl_helper<(EXECUTABLE_SUFFIX)',
18 '<(PRODUCT_DIR)/nacl_helper_bootstrap<(EXECUTABLE_SUFFIX)', 19 '<(PRODUCT_DIR)/nacl_helper_bootstrap<(EXECUTABLE_SUFFIX)',
19 ] 20 ]
20 } 21 }
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 ['OS=="win"', { 81 ['OS=="win"', {
81 'variables': { 82 'variables': {
82 'files': [ 83 'files': [
83 '<(PRODUCT_DIR)/<(version_full).manifest', 84 '<(PRODUCT_DIR)/<(version_full).manifest',
84 '<(PRODUCT_DIR)/chrome_200_percent.pak', 85 '<(PRODUCT_DIR)/chrome_200_percent.pak',
85 '<(PRODUCT_DIR)/chrome.dll', 86 '<(PRODUCT_DIR)/chrome.dll',
86 '<(PRODUCT_DIR)/chrome_elf.dll', 87 '<(PRODUCT_DIR)/chrome_elf.dll',
87 '<(PRODUCT_DIR)/ffmpegsumo.dll', 88 '<(PRODUCT_DIR)/ffmpegsumo.dll',
88 '<(PRODUCT_DIR)/libexif.dll', 89 '<(PRODUCT_DIR)/libexif.dll',
89 '<(PRODUCT_DIR)/osmesa.dll', 90 '<(PRODUCT_DIR)/osmesa.dll',
91 '<(PRODUCT_DIR)/pdf.dll',
90 ], 92 ],
91 }, 93 },
92 }], 94 }],
93 ['OS=="win" and target_arch=="ia32"', { 95 ['OS=="win" and target_arch=="ia32"', {
94 'variables': { 96 'variables': {
95 'files': [ 97 'files': [
96 '<(PRODUCT_DIR)/wow_helper.exe', 98 '<(PRODUCT_DIR)/wow_helper.exe',
97 ], 99 ],
98 }, 100 },
99 }], 101 }],
(...skipping 11 matching lines...) Expand all
111 '<(PRODUCT_DIR)/chrome_child.dll', 113 '<(PRODUCT_DIR)/chrome_child.dll',
112 ], 114 ],
113 }, 115 },
114 }], 116 }],
115 ], 117 ],
116 'includes': [ 118 'includes': [
117 'angle.isolate', 119 'angle.isolate',
118 '../gin/v8.isolate', 120 '../gin/v8.isolate',
119 ], 121 ],
120 } 122 }
OLDNEW
« no previous file with comments | « chrome/child/pdf_child_init.cc ('k') | chrome/chrome_dll.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698