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

Side by Side Diff: chrome/chrome_exe.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_bundle.gypi ('k') | chrome/chrome_tests.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 { 5 {
6 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'chrome', 8 'target_name': 'chrome',
9 'type': 'none', 9 'type': 'none',
10 'dependencies': [ 'chrome_initial', ], 10 'dependencies': [ 'chrome_initial', ],
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
181 }, 181 },
182 ], 182 ],
183 }], 183 }],
184 # x11 build. Needed for chrome_main.cc initialization of libraries. 184 # x11 build. Needed for chrome_main.cc initialization of libraries.
185 ['use_x11==1', { 185 ['use_x11==1', {
186 'dependencies': [ 186 'dependencies': [
187 '../build/linux/system.gyp:x11', 187 '../build/linux/system.gyp:x11',
188 '../build/linux/system.gyp:xext', 188 '../build/linux/system.gyp:xext',
189 ], 189 ],
190 }], 190 }],
191 ['enable_plugins==1', {
192 'dependencies': [
193 '../pdf/pdf.gyp:pdf',
194 ],
195 }],
196 ], 191 ],
197 'sources': [ 192 'sources': [
198 'app/chrome_dll_resource.h', 193 'app/chrome_dll_resource.h',
199 'app/chrome_main.cc', 194 'app/chrome_main.cc',
200 'app/chrome_main_delegate.cc', 195 'app/chrome_main_delegate.cc',
201 'app/chrome_main_delegate.h', 196 'app/chrome_main_delegate.h',
202 ], 197 ],
203 'dependencies': [ 198 'dependencies': [
204 # On Linux, link the dependencies (libraries) that make up actual 199 # On Linux, link the dependencies (libraries) that make up actual
205 # Chromium functionality directly into the executable. 200 # Chromium functionality directly into the executable.
(...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after
424 ], # postbuilds 419 ], # postbuilds
425 }, { # OS != "mac" 420 }, { # OS != "mac"
426 'conditions': [ 421 'conditions': [
427 # TODO: add a: 422 # TODO: add a:
428 # 'product_name': 'chromium' 423 # 'product_name': 'chromium'
429 # whenever we convert the rest of the infrastructure 424 # whenever we convert the rest of the infrastructure
430 # (buildbots etc.) to understand the branding gyp define. 425 # (buildbots etc.) to understand the branding gyp define.
431 # NOTE: chrome/app/theme/chromium/BRANDING and 426 # NOTE: chrome/app/theme/chromium/BRANDING and
432 # chrome/app/theme/google_chrome/BRANDING have the short name 427 # chrome/app/theme/google_chrome/BRANDING have the short name
433 # "chrome" etc.; should we try to extract from there instead? 428 # "chrome" etc.; should we try to extract from there instead?
429
430 # CrOS does this in a separate build step.
431 ['OS=="linux" and chromeos==0 and linux_dump_symbols==1', {
432 'dependencies': [
433 '../pdf/pdf.gyp:pdf_linux_symbols',
434 ],
435 }], # OS=="linux" and chromeos==0 and linux_dump_symbols==1
436 # Android doesn't use pdfium.
437 ['OS!="android"', {
438 'dependencies': [
439 # On Mac, this is done in chrome_dll.gypi.
440 '../pdf/pdf.gyp:pdf',
441 ],
442 }], # OS=="android"
434 ], 443 ],
435 'dependencies': [ 444 'dependencies': [
436 '../components/components.gyp:startup_metric_utils', 445 '../components/components.gyp:startup_metric_utils',
437 'chrome_resources.gyp:packed_extra_resources', 446 'chrome_resources.gyp:packed_extra_resources',
438 'chrome_resources.gyp:packed_resources', 447 'chrome_resources.gyp:packed_resources',
439 # Copy Flash Player files to PRODUCT_DIR if applicable. Let the .gyp 448 # Copy Flash Player files to PRODUCT_DIR if applicable. Let the .gyp
440 # file decide what to do on a per-OS basis; on Mac, internal plugins 449 # file decide what to do on a per-OS basis; on Mac, internal plugins
441 # go inside the framework, so this dependency is in chrome_dll.gypi. 450 # go inside the framework, so this dependency is in chrome_dll.gypi.
442 '../third_party/adobe/flash/flash_player.gyp:flapper_binaries', 451 '../third_party/adobe/flash/flash_player.gyp:flapper_binaries',
443 # Copy CDM files to PRODUCT_DIR if applicable. Let the .gyp 452 # Copy CDM files to PRODUCT_DIR if applicable. Let the .gyp
(...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after
682 'dependencies': [ 691 'dependencies': [
683 'chrome_nacl_win64', 692 'chrome_nacl_win64',
684 ], 693 ],
685 }], 694 }],
686 ], 695 ],
687 }, 696 },
688 ], 697 ],
689 }], 698 }],
690 ], 699 ],
691 } 700 }
OLDNEW
« no previous file with comments | « chrome/chrome_dll_bundle.gypi ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698