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

Side by Side Diff: net/net.gyp

Issue 1674353004: [Android] Fix generated scripts for junit tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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 # Enables BidirectionalStream; Used in cronet, disabled by default. 9 # Enables BidirectionalStream; Used in cronet, disabled by default.
10 'enable_bidirectional_stream%': 0, 10 'enable_bidirectional_stream%': 0,
(...skipping 1627 matching lines...) Expand 10 before | Expand all | Expand 10 after
1638 '../base/base.gyp:base', 1638 '../base/base.gyp:base',
1639 '../base/base.gyp:base_java_test_support', 1639 '../base/base.gyp:base_java_test_support',
1640 '../base/base.gyp:base_junit_test_support', 1640 '../base/base.gyp:base_junit_test_support',
1641 '../testing/android/junit/junit_test.gyp:junit_test_support', 1641 '../testing/android/junit/junit_test.gyp:junit_test_support',
1642 ], 1642 ],
1643 'variables': { 1643 'variables': {
1644 'main_class': 'org.chromium.testing.local.JunitTestMain', 1644 'main_class': 'org.chromium.testing.local.JunitTestMain',
1645 'src_paths': [ 1645 'src_paths': [
1646 'android/junit/', 1646 'android/junit/',
1647 ], 1647 ],
1648 'test_suite_name': 'net_junit_tests',
1649 'test_type': 'junit',
1648 }, 1650 },
1649 'includes': [ 1651 'includes': [
1650 '../build/host_jar.gypi', 1652 '../build/host_jar.gypi',
1653 '../build/android/test_runner.gypi',
1651 ], 1654 ],
1652 }, 1655 },
1653 ], 1656 ],
1654 'conditions': [ 1657 'conditions': [
1655 ['test_isolation_mode != "noop"', 1658 ['test_isolation_mode != "noop"',
1656 { 1659 {
1657 'targets': [ 1660 'targets': [
1658 { 1661 {
1659 'target_name': 'net_unittests_apk_run', 1662 'target_name': 'net_unittests_apk_run',
1660 'type': 'none', 1663 'type': 'none',
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
1700 '../build/isolate.gypi', 1703 '../build/isolate.gypi',
1701 ], 1704 ],
1702 'sources': [ 1705 'sources': [
1703 'net_unittests.isolate', 1706 'net_unittests.isolate',
1704 ], 1707 ],
1705 }, 1708 },
1706 ], 1709 ],
1707 }], 1710 }],
1708 ], 1711 ],
1709 } 1712 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698