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

Side by Side Diff: net/net.gyp

Issue 1138013007: Temporarily add hook for extending net_java_test_support. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@window
Patch Set: fix bug number 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 | « no previous file | 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 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 # Defines an extra set of libs with an alternate copy of org.apache.http.
9 # TODO(yfriedman): Remove this when crbug.com/488192 is fixed.
10 'net_test_extra_libs': [],
9 'linux_link_kerberos%': 0, 11 'linux_link_kerberos%': 0,
10 'conditions': [ 12 'conditions': [
11 ['chromeos==1 or embedded==1 or OS=="android" or OS=="ios"', { 13 ['chromeos==1 or embedded==1 or OS=="android" or OS=="ios"', {
12 # Disable Kerberos on ChromeOS, Android and iOS, at least for now. 14 # Disable Kerberos on ChromeOS, Android and iOS, at least for now.
13 # It needs configuration (krb5.conf and so on). 15 # It needs configuration (krb5.conf and so on).
14 'use_kerberos%': 0, 16 'use_kerberos%': 0,
15 }, { # chromeos == 0 and embedded==0 and OS!="android" and OS!="ios" 17 }, { # chromeos == 0 and embedded==0 and OS!="android" and OS!="ios"
16 'use_kerberos%': 1, 18 'use_kerberos%': 1,
17 }], 19 }],
18 ['OS=="android" and target_arch != "ia32"', { 20 ['OS=="android" and target_arch != "ia32"', {
(...skipping 1374 matching lines...) Expand 10 before | Expand all | Expand 10 after
1393 'includes': [ '../build/java_aidl.gypi' ], 1395 'includes': [ '../build/java_aidl.gypi' ],
1394 }, 1396 },
1395 { 1397 {
1396 'target_name': 'net_java_test_support', 1398 'target_name': 'net_java_test_support',
1397 'type': 'none', 1399 'type': 'none',
1398 'variables': { 1400 'variables': {
1399 'java_in_dir': '../net/test/android/javatests', 1401 'java_in_dir': '../net/test/android/javatests',
1400 }, 1402 },
1401 'dependencies': [ 1403 'dependencies': [
1402 'url_request_failed_job_java', 1404 'url_request_failed_job_java',
1403 '../base/base.gyp:base_java' 1405 '../base/base.gyp:base_java',
1406 '<@(net_test_extra_libs)',
1404 ], 1407 ],
1405 'includes': [ '../build/java.gypi' ], 1408 'includes': [ '../build/java.gypi' ],
1406 }, 1409 },
1407 { 1410 {
1408 'target_name': 'url_request_failed_job_java', 1411 'target_name': 'url_request_failed_job_java',
1409 'type': 'none', 1412 'type': 'none',
1410 'variables': { 1413 'variables': {
1411 'source_file': 'test/url_request/url_request_failed_job.h', 1414 'source_file': 'test/url_request/url_request_failed_job.h',
1412 }, 1415 },
1413 'includes': [ '../build/android/java_cpp_enum.gypi' ], 1416 'includes': [ '../build/android/java_cpp_enum.gypi' ],
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
1540 '../build/isolate.gypi', 1543 '../build/isolate.gypi',
1541 ], 1544 ],
1542 'sources': [ 1545 'sources': [
1543 'net_unittests.isolate', 1546 'net_unittests.isolate',
1544 ], 1547 ],
1545 }, 1548 },
1546 ], 1549 ],
1547 }], 1550 }],
1548 ], 1551 ],
1549 } 1552 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698