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

Side by Side Diff: net/net.gyp

Issue 10384025: fix duplicated basename network_change_notifier.cc in net target (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Created 8 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 | Annotate | Revision Log
« no previous file with comments | « net/android/network_change_notifier_factory.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) 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 'linux_link_kerberos%': 0, 9 'linux_link_kerberos%': 0,
10 'conditions': [ 10 'conditions': [
(...skipping 23 matching lines...) Expand all
34 '../sdch/sdch.gyp:sdch', 34 '../sdch/sdch.gyp:sdch',
35 '../third_party/icu/icu.gyp:icui18n', 35 '../third_party/icu/icu.gyp:icui18n',
36 '../third_party/icu/icu.gyp:icuuc', 36 '../third_party/icu/icu.gyp:icuuc',
37 '../third_party/zlib/zlib.gyp:zlib', 37 '../third_party/zlib/zlib.gyp:zlib',
38 '../v8/tools/gyp/v8.gyp:v8', 38 '../v8/tools/gyp/v8.gyp:v8',
39 'net_resources', 39 'net_resources',
40 ], 40 ],
41 'sources': [ 41 'sources': [
42 'android/net_jni_registrar.cc', 42 'android/net_jni_registrar.cc',
43 'android/net_jni_registrar.h', 43 'android/net_jni_registrar.h',
44 'android/network_change_notifier.cc', 44 'android/network_change_notifier_android.cc',
45 'android/network_change_notifier.h', 45 'android/network_change_notifier_android.h',
46 'android/network_change_notifier_factory.cc', 46 'android/network_change_notifier_factory.cc',
47 'android/network_change_notifier_factory.h', 47 'android/network_change_notifier_factory.h',
48 'android/network_library.cc', 48 'android/network_library.cc',
49 'android/network_library.h', 49 'android/network_library.h',
50 'base/address_family.h', 50 'base/address_family.h',
51 'base/address_list.cc', 51 'base/address_list.cc',
52 'base/address_list.h', 52 'base/address_list.h',
53 'base/address_list_net_log_param.cc', 53 'base/address_list_net_log_param.cc',
54 'base/address_list_net_log_param.h', 54 'base/address_list_net_log_param.h',
55 'base/asn1_util.cc', 55 'base/asn1_util.cc',
(...skipping 1790 matching lines...) Expand 10 before | Expand all | Expand 10 after
1846 'tools/dump_cache/url_to_filename_encoder.cc', 1846 'tools/dump_cache/url_to_filename_encoder.cc',
1847 'tools/dump_cache/url_to_filename_encoder.h', 1847 'tools/dump_cache/url_to_filename_encoder.h',
1848 'tools/dump_cache/url_utilities.h', 1848 'tools/dump_cache/url_utilities.h',
1849 'tools/dump_cache/url_utilities.cc', 1849 'tools/dump_cache/url_utilities.cc',
1850 ], 1850 ],
1851 }, 1851 },
1852 ], 1852 ],
1853 }], 1853 }],
1854 ], 1854 ],
1855 } 1855 }
OLDNEW
« no previous file with comments | « net/android/network_change_notifier_factory.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698