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

Side by Side Diff: base/base.gyp

Issue 1519523002: [Android] Support conditional test disabling based on android.os.Build values. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix one outdated use of SkipCheck Created 5 years 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 (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 'includes': [ 9 'includes': [
10 '../build/win_precompile.gypi', 10 '../build/win_precompile.gypi',
(...skipping 1570 matching lines...) Expand 10 before | Expand all | Expand 10 after
1581 # in the multidex shadow library. crbug.com/522043 1581 # in the multidex shadow library. crbug.com/522043
1582 # GN: //base:base_junit_test_support 1582 # GN: //base:base_junit_test_support
1583 'target_name': 'base_junit_test_support', 1583 'target_name': 'base_junit_test_support',
1584 'type': 'none', 1584 'type': 'none',
1585 'dependencies': [ 1585 'dependencies': [
1586 '../testing/android/junit/junit_test.gyp:junit_test_support', 1586 '../testing/android/junit/junit_test.gyp:junit_test_support',
1587 '../third_party/android_tools/android_tools.gyp:android_support_mult idex_javalib', 1587 '../third_party/android_tools/android_tools.gyp:android_support_mult idex_javalib',
1588 ], 1588 ],
1589 'variables': { 1589 'variables': {
1590 'src_paths': [ 1590 'src_paths': [
1591 '../base/test/android/junit/', 1591 '../base/test/android/junit/src/org/chromium/base/test/shadows/Sha dowMultiDex.java',
1592 ], 1592 ],
1593 }, 1593 },
1594 'includes': [ '../build/host_jar.gypi' ] 1594 'includes': [ '../build/host_jar.gypi' ]
1595 }, 1595 },
1596 { 1596 {
1597 # GN: //base:base_junit_tests 1597 # GN: //base:base_junit_tests
1598 'target_name': 'base_junit_tests', 1598 'target_name': 'base_junit_tests',
1599 'type': 'none', 1599 'type': 'none',
1600 'dependencies': [ 1600 'dependencies': [
1601 'base_java', 1601 'base_java',
1602 'base_java_test_support', 1602 'base_java_test_support',
1603 'base_junit_test_support', 1603 'base_junit_test_support',
1604 '../testing/android/junit/junit_test.gyp:junit_test_support', 1604 '../testing/android/junit/junit_test.gyp:junit_test_support',
1605 ], 1605 ],
1606 'variables': { 1606 'variables': {
1607 'main_class': 'org.chromium.testing.local.JunitTestMain', 1607 'main_class': 'org.chromium.testing.local.JunitTestMain',
1608 'src_paths': [ 1608 'src_paths': [
1609 '../base/android/junit/', 1609 '../base/android/junit/',
1610 '../base/test/android/junit/src/org/chromium/base/test/util/Disab leIfTest.java',
1610 ], 1611 ],
1611 }, 1612 },
1612 'includes': [ '../build/host_jar.gypi' ], 1613 'includes': [ '../build/host_jar.gypi' ],
1613 }, 1614 },
1614 { 1615 {
1615 # GN: //base:base_javatests 1616 # GN: //base:base_javatests
1616 'target_name': 'base_javatests', 1617 'target_name': 'base_javatests',
1617 'type': 'none', 1618 'type': 'none',
1618 'dependencies': [ 1619 'dependencies': [
1619 'base_java', 1620 'base_java',
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
1735 '../build/isolate.gypi', 1736 '../build/isolate.gypi',
1736 ], 1737 ],
1737 'sources': [ 1738 'sources': [
1738 'base_unittests.isolate', 1739 'base_unittests.isolate',
1739 ], 1740 ],
1740 }, 1741 },
1741 ], 1742 ],
1742 }], 1743 }],
1743 ], 1744 ],
1744 } 1745 }
OLDNEW
« no previous file with comments | « base/BUILD.gn ('k') | base/test/android/javatests/src/org/chromium/base/test/BaseInstrumentationTestRunner.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698