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

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: Fix copyright and add unit test assertions Created 5 years, 7 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/chromeos/codec/jpeg_codec_robust_slow_unittest.cc ('k') | ui/gfx/gfx_tests.gyp » ('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 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'targets': [ 9 'targets': [
10 { 10 {
(...skipping 350 matching lines...) Expand 10 before | Expand all | Expand 10 after
361 'gfx_jni_headers', 361 'gfx_jni_headers',
362 '<(DEPTH)/base/base.gyp:base_java', 362 '<(DEPTH)/base/base.gyp:base_java',
363 ], 363 ],
364 'link_settings': { 364 'link_settings': {
365 'libraries': [ 365 'libraries': [
366 '-landroid', 366 '-landroid',
367 '-ljnigraphics', 367 '-ljnigraphics',
368 ], 368 ],
369 }, 369 },
370 }], 370 }],
371 ['chromeos==1', {
372 # Chrome OS requires robust JPEG decoding for the login screen.
373 'sources': [
374 'chromeos/codec/jpeg_codec_robust_slow.cc',
375 'chromeos/codec/jpeg_codec_robust_slow.h',
376 ],
377 'dependencies': [
378 '<(libjpeg_ijg_gyp_path):libjpeg',
379 ],
380 }],
371 ['use_aura==0 and toolkit_views==0', { 381 ['use_aura==0 and toolkit_views==0', {
372 'sources!': [ 382 'sources!': [
373 'nine_image_painter.cc', 383 'nine_image_painter.cc',
374 'nine_image_painter.h', 384 'nine_image_painter.h',
375 ], 385 ],
376 }], 386 }],
377 ['OS=="android" and use_aura==0', { 387 ['OS=="android" and use_aura==0', {
378 'sources!': [ 388 'sources!': [
379 'path.cc', 389 'path.cc',
380 ], 390 ],
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
478 ], 488 ],
479 'variables': { 489 'variables': {
480 'jni_gen_package': 'ui/gfx', 490 'jni_gen_package': 'ui/gfx',
481 }, 491 },
482 'includes': [ '../../build/jni_generator.gypi' ], 492 'includes': [ '../../build/jni_generator.gypi' ],
483 }, 493 },
484 ], 494 ],
485 }], 495 }],
486 ], 496 ],
487 } 497 }
OLDNEW
« no previous file with comments | « ui/gfx/chromeos/codec/jpeg_codec_robust_slow_unittest.cc ('k') | ui/gfx/gfx_tests.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698