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

Side by Side Diff: base/base.gyp

Issue 2168003003: Replace ICU encoding detection with CED (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: addressed comments Created 4 years, 4 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
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 258 matching lines...) Expand 10 before | Expand all | Expand 10 after
269 'target_name': 'base_i18n', 269 'target_name': 'base_i18n',
270 'type': '<(component)', 270 'type': '<(component)',
271 'variables': { 271 'variables': {
272 'enable_wexit_time_destructors': 1, 272 'enable_wexit_time_destructors': 1,
273 'optimize': 'max', 273 'optimize': 'max',
274 'base_i18n_target': 1, 274 'base_i18n_target': 1,
275 }, 275 },
276 'dependencies': [ 276 'dependencies': [
277 'base', 277 'base',
278 'third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotat ions', 278 'third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotat ions',
279 '../third_party/ced/ced.gyp:ced',
279 '../third_party/icu/icu.gyp:icui18n', 280 '../third_party/icu/icu.gyp:icui18n',
280 '../third_party/icu/icu.gyp:icuuc', 281 '../third_party/icu/icu.gyp:icuuc',
281 ], 282 ],
282 'conditions': [ 283 'conditions': [
283 ['OS == "win"', { 284 ['OS == "win"', {
284 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 285 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
285 'msvs_disabled_warnings': [ 286 'msvs_disabled_warnings': [
286 4267, 287 4267,
287 ], 288 ],
288 }], 289 }],
(...skipping 335 matching lines...) Expand 10 before | Expand all | Expand 10 after
624 'allocator/allocator.gyp:allocator_features#target', 625 'allocator/allocator.gyp:allocator_features#target',
625 'base', 626 'base',
626 'base_i18n', 627 'base_i18n',
627 'base_message_loop_tests', 628 'base_message_loop_tests',
628 'base_static', 629 'base_static',
629 'run_all_unittests', 630 'run_all_unittests',
630 'test_support_base', 631 'test_support_base',
631 'third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotat ions', 632 'third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotat ions',
632 '../testing/gmock.gyp:gmock', 633 '../testing/gmock.gyp:gmock',
633 '../testing/gtest.gyp:gtest', 634 '../testing/gtest.gyp:gtest',
635 '../third_party/ced/ced.gyp:ced',
634 '../third_party/icu/icu.gyp:icui18n', 636 '../third_party/icu/icu.gyp:icui18n',
635 '../third_party/icu/icu.gyp:icuuc', 637 '../third_party/icu/icu.gyp:icuuc',
636 ], 638 ],
637 'includes': ['../build/nocompile.gypi'], 639 'includes': ['../build/nocompile.gypi'],
638 'variables': { 640 'variables': {
639 # TODO(ajwong): Is there a way to autodetect this? 641 # TODO(ajwong): Is there a way to autodetect this?
640 'module_dir': 'base' 642 'module_dir': 'base'
641 }, 643 },
642 'conditions': [ 644 'conditions': [
643 ['cfi_vptr==1 and cfi_cast==1', { 645 ['cfi_vptr==1 and cfi_cast==1', {
(...skipping 1150 matching lines...) Expand 10 before | Expand all | Expand 10 after
1794 ['include', 'mac/bind_objc_block_unittest_arc\\.mm$'], 1796 ['include', 'mac/bind_objc_block_unittest_arc\\.mm$'],
1795 ['include', 'mac/scoped_nsobject_unittest_arc\\.mm$'], 1797 ['include', 'mac/scoped_nsobject_unittest_arc\\.mm$'],
1796 ], 1798 ],
1797 }] 1799 }]
1798 ], 1800 ],
1799 }, 1801 },
1800 ], 1802 ],
1801 }], 1803 }],
1802 ], 1804 ],
1803 } 1805 }
OLDNEW
« no previous file with comments | « base/DEPS ('k') | base/base.gypi » ('j') | base/i18n/encoding_detection.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698