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

Side by Side Diff: net/net.gyp

Issue 46303005: Fix chrome upload with content uri (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: simplify the change using FILE enum instead of adding a new enum Created 7 years, 1 month 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
OLDNEW
1 # Copyright 2013 The Chromium Authors. All rights reserved. 1 # Copyright 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 'linux_link_kerberos%': 0, 9 'linux_link_kerberos%': 0,
10 'use_tracing_cache_backend%': 0, 10 'use_tracing_cache_backend%': 0,
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 '../sdch/sdch.gyp:sdch', 55 '../sdch/sdch.gyp:sdch',
56 '../third_party/icu/icu.gyp:icui18n', 56 '../third_party/icu/icu.gyp:icui18n',
57 '../third_party/icu/icu.gyp:icuuc', 57 '../third_party/icu/icu.gyp:icuuc',
58 '../third_party/zlib/zlib.gyp:zlib', 58 '../third_party/zlib/zlib.gyp:zlib',
59 '../url/url.gyp:url_lib', 59 '../url/url.gyp:url_lib',
60 'net_resources', 60 'net_resources',
61 ], 61 ],
62 'sources': [ 62 'sources': [
63 'android/cert_verify_result_android.h', 63 'android/cert_verify_result_android.h',
64 'android/cert_verify_result_android_list.h', 64 'android/cert_verify_result_android_list.h',
65 'android/content_uri_utils.cc',
66 'android/content_uri_utils.h',
65 'android/gurl_utils.cc', 67 'android/gurl_utils.cc',
66 'android/gurl_utils.h', 68 'android/gurl_utils.h',
67 'android/keystore.cc', 69 'android/keystore.cc',
68 'android/keystore.h', 70 'android/keystore.h',
69 'android/keystore_openssl.cc', 71 'android/keystore_openssl.cc',
70 'android/keystore_openssl.h', 72 'android/keystore_openssl.h',
71 'android/net_jni_registrar.cc', 73 'android/net_jni_registrar.cc',
72 'android/net_jni_registrar.h', 74 'android/net_jni_registrar.h',
73 'android/network_change_notifier_android.cc', 75 'android/network_change_notifier_android.cc',
74 'android/network_change_notifier_android.h', 76 'android/network_change_notifier_android.h',
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 'base/dns_reloader.h', 108 'base/dns_reloader.h',
107 'base/dns_util.cc', 109 'base/dns_util.cc',
108 'base/dns_util.h', 110 'base/dns_util.h',
109 'base/escape.cc', 111 'base/escape.cc',
110 'base/escape.h', 112 'base/escape.h',
111 'base/expiring_cache.h', 113 'base/expiring_cache.h',
112 'base/file_stream.cc', 114 'base/file_stream.cc',
113 'base/file_stream.h', 115 'base/file_stream.h',
114 'base/file_stream_context.cc', 116 'base/file_stream_context.cc',
115 'base/file_stream_context.h', 117 'base/file_stream_context.h',
118 'base/file_stream_context_android.cc',
116 'base/file_stream_context_posix.cc', 119 'base/file_stream_context_posix.cc',
117 'base/file_stream_context_win.cc', 120 'base/file_stream_context_win.cc',
118 'base/file_stream_metrics.cc', 121 'base/file_stream_metrics.cc',
119 'base/file_stream_metrics.h', 122 'base/file_stream_metrics.h',
120 'base/file_stream_metrics_posix.cc', 123 'base/file_stream_metrics_posix.cc',
121 'base/file_stream_metrics_win.cc', 124 'base/file_stream_metrics_win.cc',
122 'base/file_stream_net_log_parameters.cc', 125 'base/file_stream_net_log_parameters.cc',
123 'base/file_stream_net_log_parameters.h', 126 'base/file_stream_net_log_parameters.h',
124 'base/file_stream_whence.h', 127 'base/file_stream_whence.h',
125 'base/filter.cc', 128 'base/filter.cc',
(...skipping 2716 matching lines...) Expand 10 before | Expand all | Expand 10 after
2842 ] 2845 ]
2843 }], 2846 }],
2844 ['OS=="android"', { 2847 ['OS=="android"', {
2845 'targets': [ 2848 'targets': [
2846 { 2849 {
2847 'target_name': 'net_jni_headers', 2850 'target_name': 'net_jni_headers',
2848 'type': 'none', 2851 'type': 'none',
2849 'sources': [ 2852 'sources': [
2850 'android/java/src/org/chromium/net/AndroidKeyStore.java', 2853 'android/java/src/org/chromium/net/AndroidKeyStore.java',
2851 'android/java/src/org/chromium/net/AndroidNetworkLibrary.java', 2854 'android/java/src/org/chromium/net/AndroidNetworkLibrary.java',
2855 'android/java/src/org/chromium/net/ContentUriUtils.java',
2852 'android/java/src/org/chromium/net/GURLUtils.java', 2856 'android/java/src/org/chromium/net/GURLUtils.java',
2853 'android/java/src/org/chromium/net/NetworkChangeNotifier.java', 2857 'android/java/src/org/chromium/net/NetworkChangeNotifier.java',
2854 'android/java/src/org/chromium/net/ProxyChangeListener.java', 2858 'android/java/src/org/chromium/net/ProxyChangeListener.java',
2855 'android/java/src/org/chromium/net/X509Util.java', 2859 'android/java/src/org/chromium/net/X509Util.java',
2856 ], 2860 ],
2857 'variables': { 2861 'variables': {
2858 'jni_gen_package': 'net', 2862 'jni_gen_package': 'net',
2859 }, 2863 },
2860 'direct_dependent_settings': { 2864 'direct_dependent_settings': {
2861 'include_dirs': [ 2865 'include_dirs': [
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
3015 'net_unittests.isolate', 3019 'net_unittests.isolate',
3016 ], 3020 ],
3017 'sources': [ 3021 'sources': [
3018 'net_unittests.isolate', 3022 'net_unittests.isolate',
3019 ], 3023 ],
3020 }, 3024 },
3021 ], 3025 ],
3022 }], 3026 }],
3023 ], 3027 ],
3024 } 3028 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698