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

Side by Side Diff: net/net.gyp

Issue 1417973002: [Cronet] Switch from InstrumentationTest to junit (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address Helen's comments Created 5 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
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 'linux_link_kerberos%': 0, 8 'linux_link_kerberos%': 0,
9 'conditions': [ 9 'conditions': [
10 ['chromeos==1 or embedded==1 or OS=="ios"', { 10 ['chromeos==1 or embedded==1 or OS=="ios"', {
(...skipping 1425 matching lines...) Expand 10 before | Expand all | Expand 10 after
1436 { 1436 {
1437 'target_name': 'net_javatests', 1437 'target_name': 'net_javatests',
1438 'type': 'none', 1438 'type': 'none',
1439 'variables': { 1439 'variables': {
1440 'java_in_dir': '../net/android/javatests', 1440 'java_in_dir': '../net/android/javatests',
1441 }, 1441 },
1442 'dependencies': [ 1442 'dependencies': [
1443 '../base/base.gyp:base', 1443 '../base/base.gyp:base',
1444 '../base/base.gyp:base_java_test_support', 1444 '../base/base.gyp:base_java_test_support',
1445 'net_java', 1445 'net_java',
1446 'net_java_test_support',
1446 ], 1447 ],
1447 'includes': [ '../build/java.gypi' ], 1448 'includes': [ '../build/java.gypi' ],
1448 }, 1449 },
1449 { 1450 {
1450 'target_name': 'net_errors_java', 1451 'target_name': 'net_errors_java',
1451 'type': 'none', 1452 'type': 'none',
1452 'sources': [ 1453 'sources': [
1453 'android/java/NetError.template', 1454 'android/java/NetError.template',
1454 ], 1455 ],
1455 'variables': { 1456 'variables': {
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after
1618 '../build/isolate.gypi', 1619 '../build/isolate.gypi',
1619 ], 1620 ],
1620 'sources': [ 1621 'sources': [
1621 'net_unittests.isolate', 1622 'net_unittests.isolate',
1622 ], 1623 ],
1623 }, 1624 },
1624 ], 1625 ],
1625 }], 1626 }],
1626 ], 1627 ],
1627 } 1628 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698