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

Side by Side Diff: components/components_tests.gyp

Issue 1552333002: Resubmit Supervised user web restrictions content provider (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Manual rebase to fix merge problem Created 4 years, 11 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 | « components/components.gyp ('k') | components/web_restriction.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 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 # This turns on e.g. the filename-based detection of which 7 # This turns on e.g. the filename-based detection of which
8 # platforms to include source files on (e.g. files ending in 8 # platforms to include source files on (e.g. files ending in
9 # _mac.h or _mac.cc are only compiled on MacOSX). 9 # _mac.h or _mac.cc are only compiled on MacOSX).
10 'chromium_code': 1, 10 'chromium_code': 1,
(...skipping 1611 matching lines...) Expand 10 before | Expand all | Expand 10 after
1622 }, 1622 },
1623 'includes': [ '../build/apk_test.gypi' ], 1623 'includes': [ '../build/apk_test.gypi' ],
1624 }, 1624 },
1625 { 1625 {
1626 'target_name': 'components_junit_tests', 1626 'target_name': 'components_junit_tests',
1627 'type': 'none', 1627 'type': 'none',
1628 'dependencies': [ 1628 'dependencies': [
1629 'components.gyp:invalidation_java', 1629 'components.gyp:invalidation_java',
1630 'components.gyp:policy_java', 1630 'components.gyp:policy_java',
1631 'components.gyp:policy_java_test_support', 1631 'components.gyp:policy_java_test_support',
1632 'components.gyp:web_restriction_java',
1632 '../base/base.gyp:base_java', 1633 '../base/base.gyp:base_java',
1633 '../base/base.gyp:base_java_test_support', 1634 '../base/base.gyp:base_java_test_support',
1634 '../testing/android/junit/junit_test.gyp:junit_test_support', 1635 '../testing/android/junit/junit_test.gyp:junit_test_support',
1635 ], 1636 ],
1636 'variables': { 1637 'variables': {
1637 'main_class': 'org.chromium.testing.local.JunitTestMain', 1638 'main_class': 'org.chromium.testing.local.JunitTestMain',
1638 'src_paths': [ 1639 'src_paths': [
1639 'invalidation/impl/android/junit/', 1640 'invalidation/impl/android/junit/',
1640 'policy/android/junit/' 1641 'policy/android/junit/',
1642 'web_restriction/junit/'
1641 ], 1643 ],
1642 }, 1644 },
1643 'includes': [ '../build/host_jar.gypi' ], 1645 'includes': [ '../build/host_jar.gypi' ],
1644 }, 1646 },
1645 ], 1647 ],
1646 'conditions': [ 1648 'conditions': [
1647 ['test_isolation_mode != "noop"', 1649 ['test_isolation_mode != "noop"',
1648 { 1650 {
1649 'targets': [ 1651 'targets': [
1650 { 1652 {
(...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after
1875 'dependencies': [ 1877 'dependencies': [
1876 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 1878 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
1877 ], 1879 ],
1878 }], 1880 }],
1879 ], 1881 ],
1880 }, 1882 },
1881 ], 1883 ],
1882 }], 1884 }],
1883 ], 1885 ],
1884 } 1886 }
OLDNEW
« no previous file with comments | « components/components.gyp ('k') | components/web_restriction.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698