| OLD | NEW |
| 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 # Defines an extra set of libs with an alternate copy of org.apache.http. | 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. | 9 # TODO(yfriedman): Remove this when crbug.com/488192 is fixed. |
| 10 'net_test_extra_libs': [], | 10 'net_test_extra_libs': [], |
| (...skipping 1530 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1541 }, | 1541 }, |
| 1542 'includes': [ '../build/apk_test.gypi' ], | 1542 'includes': [ '../build/apk_test.gypi' ], |
| 1543 }, | 1543 }, |
| 1544 { | 1544 { |
| 1545 'target_name': 'net_junit_tests', | 1545 'target_name': 'net_junit_tests', |
| 1546 'type': 'none', | 1546 'type': 'none', |
| 1547 'dependencies': [ | 1547 'dependencies': [ |
| 1548 'net_java', | 1548 'net_java', |
| 1549 '../base/base.gyp:base', | 1549 '../base/base.gyp:base', |
| 1550 '../base/base.gyp:base_java_test_support', | 1550 '../base/base.gyp:base_java_test_support', |
| 1551 '../base/base.gyp:base_junit_test_support', |
| 1551 '../testing/android/junit/junit_test.gyp:junit_test_support', | 1552 '../testing/android/junit/junit_test.gyp:junit_test_support', |
| 1552 ], | 1553 ], |
| 1553 'variables': { | 1554 'variables': { |
| 1554 'main_class': 'org.chromium.testing.local.JunitTestMain', | 1555 'main_class': 'org.chromium.testing.local.JunitTestMain', |
| 1555 'src_paths': [ | 1556 'src_paths': [ |
| 1556 'android/junit/', | 1557 'android/junit/', |
| 1557 ], | 1558 ], |
| 1558 }, | 1559 }, |
| 1559 'includes': [ | 1560 'includes': [ |
| 1560 '../build/host_jar.gypi', | 1561 '../build/host_jar.gypi', |
| (...skipping 29 matching lines...) Expand all Loading... |
| 1590 '../build/isolate.gypi', | 1591 '../build/isolate.gypi', |
| 1591 ], | 1592 ], |
| 1592 'sources': [ | 1593 'sources': [ |
| 1593 'net_unittests.isolate', | 1594 'net_unittests.isolate', |
| 1594 ], | 1595 ], |
| 1595 }, | 1596 }, |
| 1596 ], | 1597 ], |
| 1597 }], | 1598 }], |
| 1598 ], | 1599 ], |
| 1599 } | 1600 } |
| OLD | NEW |