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

Side by Side Diff: base/base.gyp

Issue 1100763002: Inject CanAddURLToHistory into TopSitesImpl (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@prefs
Patch Set: Fix error introduced during rebase 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 | « base/android/junit/src/org/chromium/base/LogTest.java ('k') | base/i18n/icu_util.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 785 matching lines...) Expand 10 before | Expand all | Expand 10 after
796 'allocator/allocator.gyp:allocator', 796 'allocator/allocator.gyp:allocator',
797 ], 797 ],
798 }], 798 }],
799 ['icu_use_data_file_flag==0', { 799 ['icu_use_data_file_flag==0', {
800 # This is needed to trigger the dll copy step on windows. 800 # This is needed to trigger the dll copy step on windows.
801 # TODO(mark): This should not be necessary. 801 # TODO(mark): This should not be necessary.
802 'dependencies': [ 802 'dependencies': [
803 '../third_party/icu/icu.gyp:icudata', 803 '../third_party/icu/icu.gyp:icudata',
804 ], 804 ],
805 }], 805 }],
806 ['incremental_chrome_dll', {
807 'defines': [
808 # Used only to workaround a linker bug, do not use this
809 # otherwise, and don't make it broader scope. See
810 # http://crbug.com/251251.
811 'INCREMENTAL_LINKING',
812 ],
813 }],
814 ], 806 ],
815 }, { # OS != "win" 807 }, { # OS != "win"
816 'dependencies': [ 808 'dependencies': [
817 '../third_party/libevent/libevent.gyp:libevent' 809 '../third_party/libevent/libevent.gyp:libevent'
818 ], 810 ],
819 }], 811 }],
820 ], # conditions 812 ], # conditions
821 'target_conditions': [ 813 'target_conditions': [
822 ['OS == "ios" and _toolset != "host"', { 814 ['OS == "ios" and _toolset != "host"', {
823 'sources/': [ 815 'sources/': [
(...skipping 678 matching lines...) Expand 10 before | Expand all | Expand 10 after
1502 'type': 'none', 1494 'type': 'none',
1503 'dependencies': [ 1495 'dependencies': [
1504 'base_java', 1496 'base_java',
1505 ], 1497 ],
1506 'variables': { 1498 'variables': {
1507 'java_in_dir': '../base/test/android/javatests', 1499 'java_in_dir': '../base/test/android/javatests',
1508 }, 1500 },
1509 'includes': [ '../build/java.gypi' ], 1501 'includes': [ '../build/java.gypi' ],
1510 }, 1502 },
1511 { 1503 {
1504 # GN: //base:base_junit_tests
1505 'target_name': 'base_junit_tests',
1506 'type': 'none',
1507 'dependencies': [
1508 'base_java',
1509 'base_java_test_support',
1510 '../testing/android/junit/junit_test.gyp:junit_test_support',
1511 ],
1512 'variables': {
1513 'main_class': 'org.chromium.testing.local.JunitTestMain',
1514 'src_paths': [
1515 '../base/android/junit/',
1516 ],
1517 },
1518 'includes': [ '../build/host_jar.gypi' ],
1519 },
1520 {
1512 # GN: //base:base_javatests 1521 # GN: //base:base_javatests
1513 'target_name': 'base_javatests', 1522 'target_name': 'base_javatests',
1514 'type': 'none', 1523 'type': 'none',
1515 'dependencies': [ 1524 'dependencies': [
1516 'base_java', 1525 'base_java',
1517 'base_java_test_support', 1526 'base_java_test_support',
1518 ], 1527 ],
1519 'variables': { 1528 'variables': {
1520 'java_in_dir': '../base/android/javatests', 1529 'java_in_dir': '../base/android/javatests',
1521 }, 1530 },
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
1623 'dependencies': [ 1632 'dependencies': [
1624 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 1633 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
1625 ], 1634 ],
1626 }], 1635 }],
1627 ], 1636 ],
1628 }, 1637 },
1629 ], 1638 ],
1630 }], 1639 }],
1631 ], 1640 ],
1632 } 1641 }
OLDNEW
« no previous file with comments | « base/android/junit/src/org/chromium/base/LogTest.java ('k') | base/i18n/icu_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698