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

Side by Side Diff: net/net.gyp

Issue 11065035: Don't make base/net/ui depend on their Java counterpart when building for webview. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add missing ui.gyp Created 8 years, 2 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 | « base/base.gyp ('k') | ui/ui.gyp » ('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 'linux_link_kerberos%': 0, 9 'linux_link_kerberos%': 0,
10 'conditions': [ 10 'conditions': [
(...skipping 1130 matching lines...) Expand 10 before | Expand all | Expand 10 after
1141 ['include', '^http/http_version\\.h$'], 1141 ['include', '^http/http_version\\.h$'],
1142 ['include', '^url_request/url_request_job_manager\\.'], 1142 ['include', '^url_request/url_request_job_manager\\.'],
1143 ['include', '^proxy/dhcp_proxy_script_fetcher\\.'], 1143 ['include', '^proxy/dhcp_proxy_script_fetcher\\.'],
1144 ['include', '^proxy/polling_proxy_config_service\\.'], 1144 ['include', '^proxy/polling_proxy_config_service\\.'],
1145 ['include', '^proxy/proxy_config\\.'], 1145 ['include', '^proxy/proxy_config\\.'],
1146 ['include', '^proxy/proxy_config_service_ios\\.'], 1146 ['include', '^proxy/proxy_config_service_ios\\.'],
1147 ['include', '^proxy/proxy_service\\.'], 1147 ['include', '^proxy/proxy_service\\.'],
1148 ], 1148 ],
1149 }, 1149 },
1150 ], 1150 ],
1151 ['OS=="android" and _toolset=="target"', { 1151 ['OS=="android" and _toolset=="target" and android_build_type == 0', {
1152 'dependencies': [ 1152 'dependencies': [
1153 'net_java', 1153 'net_java',
1154 ], 1154 ],
1155 'export_dependent_settings': [ 1155 'export_dependent_settings': [
1156 'net_java', 1156 'net_java',
1157 ], 1157 ],
1158 }], 1158 }],
1159 [ 'OS == "android"', { 1159 [ 'OS == "android"', {
1160 'dependencies': [ 1160 'dependencies': [
1161 '../third_party/openssl/openssl.gyp:openssl', 1161 '../third_party/openssl/openssl.gyp:openssl',
(...skipping 1153 matching lines...) Expand 10 before | Expand all | Expand 10 after
2315 '--result', '<@(_outputs)', 2315 '--result', '<@(_outputs)',
2316 '--isolate', 'net_unittests.isolate', 2316 '--isolate', 'net_unittests.isolate',
2317 ], 2317 ],
2318 }, 2318 },
2319 ], 2319 ],
2320 }, 2320 },
2321 ], 2321 ],
2322 }], 2322 }],
2323 ], 2323 ],
2324 } 2324 }
OLDNEW
« no previous file with comments | « base/base.gyp ('k') | ui/ui.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698