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

Side by Side Diff: ui/gfx/gfx.gyp

Issue 569623002: Switch ChromeOS Chromium login to use IJG libjpeg (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: ChromeOS never uses USE_SYSTEM_* Created 6 years, 3 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 | « ui/gfx/codec/jpeg_codec.cc ('k') | no next file » | 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 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'targets': [ 9 'targets': [
10 { 10 {
(...skipping 342 matching lines...) Expand 10 before | Expand all | Expand 10 after
353 'dependencies': [ 353 'dependencies': [
354 'gfx_jni_headers', 354 'gfx_jni_headers',
355 ], 355 ],
356 'link_settings': { 356 'link_settings': {
357 'libraries': [ 357 'libraries': [
358 '-landroid', 358 '-landroid',
359 '-ljnigraphics', 359 '-ljnigraphics',
360 ], 360 ],
361 }, 361 },
362 }], 362 }],
363 ['chromeos==1', {
364 # Chrome OS requires robust JPEG decoding for the login screen.
365 'dependencies': [
366 '<(DEPTH)/third_party/libjpeg/libjpeg.gyp:libjpeg',
sky 2014/09/17 14:38:20 Can you make this: '<(libjpeg_gyp_path):libjpeg',
367 ],
368 }],
363 ['use_aura==0 and toolkit_views==0', { 369 ['use_aura==0 and toolkit_views==0', {
364 'sources!': [ 370 'sources!': [
365 'nine_image_painter.cc', 371 'nine_image_painter.cc',
366 'nine_image_painter.h', 372 'nine_image_painter.h',
367 ], 373 ],
368 }], 374 }],
369 ['OS=="android" and use_aura==0', { 375 ['OS=="android" and use_aura==0', {
370 'sources!': [ 376 'sources!': [
371 'path.cc', 377 'path.cc',
372 ], 378 ],
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
473 ], 479 ],
474 'variables': { 480 'variables': {
475 'jni_gen_package': 'ui/gfx', 481 'jni_gen_package': 'ui/gfx',
476 }, 482 },
477 'includes': [ '../../build/jni_generator.gypi' ], 483 'includes': [ '../../build/jni_generator.gypi' ],
478 }, 484 },
479 ], 485 ],
480 }], 486 }],
481 ], 487 ],
482 } 488 }
OLDNEW
« no previous file with comments | « ui/gfx/codec/jpeg_codec.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698