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

Side by Side Diff: base/base.gyp

Issue 9860035: Fix handling of Unicode BOMs in JSONReader. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge origin/master Created 8 years, 9 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | base/json/json_reader.cc » ('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 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'includes': [ 9 'includes': [
10 '../build/win_precompile.gypi', 10 '../build/win_precompile.gypi',
(...skipping 518 matching lines...) Expand 10 before | Expand all | Expand 10 after
529 '--mode=<(tests_run)', 529 '--mode=<(tests_run)',
530 '--root', '<(DEPTH)', 530 '--root', '<(DEPTH)',
531 '--result', '<@(_outputs)', 531 '--result', '<@(_outputs)',
532 '--files', '<@(_inputs)', 532 '--files', '<@(_inputs)',
533 # Directories can't be tracked by build tools (make, msbuild, xcode, 533 # Directories can't be tracked by build tools (make, msbuild, xcode,
534 # etc) so we just put it on the command line without specifying it 534 # etc) so we just put it on the command line without specifying it
535 # as an input. 535 # as an input.
536 # TODO(maruel): Revisit the support for this at all and list each 536 # TODO(maruel): Revisit the support for this at all and list each
537 # individual test files instead. 537 # individual test files instead.
538 'data/file_util_unittest/', 538 'data/file_util_unittest/',
539 'data/json/bom_feff.json',
539 '--', 540 '--',
540 # Wraps base_unittests under xvfb. 541 # Wraps base_unittests under xvfb.
541 '<(DEPTH)/testing/xvfb.py', 542 '<(DEPTH)/testing/xvfb.py',
542 '<(PRODUCT_DIR)', 543 '<(PRODUCT_DIR)',
543 '<(PRODUCT_DIR)/base_unittests<(EXECUTABLE_SUFFIX)', 544 '<(PRODUCT_DIR)/base_unittests<(EXECUTABLE_SUFFIX)',
544 ], 545 ],
545 }, 546 },
546 ], 547 ],
547 }, 548 },
548 { 549 {
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
649 # treated as weak imports in dependents, who still must 650 # treated as weak imports in dependents, who still must
650 # #include closure_blocks_leopard_compat.h to get weak imports. 651 # #include closure_blocks_leopard_compat.h to get weak imports.
651 'type': 'none', 652 'type': 'none',
652 }], 653 }],
653 ], 654 ],
654 }, 655 },
655 ], 656 ],
656 }], 657 }],
657 ], 658 ],
658 } 659 }
OLDNEW
« no previous file with comments | « no previous file | base/json/json_reader.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698