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

Side by Side Diff: components/components_tests.gyp

Issue 1684153002: Web restrictions component. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix test compilation errors. 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 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 847 matching lines...) Expand 10 before | Expand all | Expand 10 after
858 ], 858 ],
859 'web_modal_unittest_sources': [ 859 'web_modal_unittest_sources': [
860 'web_modal/web_contents_modal_dialog_manager_unittest.cc', 860 'web_modal/web_contents_modal_dialog_manager_unittest.cc',
861 ], 861 ],
862 'web_resource_unittest_sources': [ 862 'web_resource_unittest_sources': [
863 'web_resource/eula_accepted_notifier_unittest.cc', 863 'web_resource/eula_accepted_notifier_unittest.cc',
864 'web_resource/promo_resource_service_mobile_ntp_unittest.cc', 864 'web_resource/promo_resource_service_mobile_ntp_unittest.cc',
865 'web_resource/promo_resource_service_unittest.cc', 865 'web_resource/promo_resource_service_unittest.cc',
866 'web_resource/resource_request_allowed_notifier_unittest.cc', 866 'web_resource/resource_request_allowed_notifier_unittest.cc',
867 ], 867 ],
868 'web_restrictions_unittest_sources' : [
869 'web_restrictions/browser/web_restrictions_client_unittest.cc',
870 'web_restrictions/browser/web_restrictions_resource_throttle_unittest.cc',
871 ],
868 'webcrypto_unittest_sources': [ 872 'webcrypto_unittest_sources': [
869 'webcrypto/algorithms/aes_cbc_unittest.cc', 873 'webcrypto/algorithms/aes_cbc_unittest.cc',
870 'webcrypto/algorithms/aes_ctr_unittest.cc', 874 'webcrypto/algorithms/aes_ctr_unittest.cc',
871 'webcrypto/algorithms/aes_gcm_unittest.cc', 875 'webcrypto/algorithms/aes_gcm_unittest.cc',
872 'webcrypto/algorithms/aes_kw_unittest.cc', 876 'webcrypto/algorithms/aes_kw_unittest.cc',
873 'webcrypto/algorithms/ecdh_unittest.cc', 877 'webcrypto/algorithms/ecdh_unittest.cc',
874 'webcrypto/algorithms/ecdsa_unittest.cc', 878 'webcrypto/algorithms/ecdsa_unittest.cc',
875 'webcrypto/algorithms/hmac_unittest.cc', 879 'webcrypto/algorithms/hmac_unittest.cc',
876 'webcrypto/algorithms/rsa_oaep_unittest.cc', 880 'webcrypto/algorithms/rsa_oaep_unittest.cc',
877 'webcrypto/algorithms/rsa_pss_unittest.cc', 881 'webcrypto/algorithms/rsa_pss_unittest.cc',
(...skipping 374 matching lines...) Expand 10 before | Expand all | Expand 10 after
1252 'components.gyp:web_modal', 1256 'components.gyp:web_modal',
1253 'components.gyp:web_modal_test_support', 1257 'components.gyp:web_modal_test_support',
1254 'scheduler/scheduler.gyp:scheduler', 1258 'scheduler/scheduler.gyp:scheduler',
1255 'test_runner/test_runner.gyp:test_runner', 1259 'test_runner/test_runner.gyp:test_runner',
1256 'tracing.gyp:tracing', 1260 'tracing.gyp:tracing',
1257 'webcrypto/webcrypto.gyp:webcrypto', 1261 'webcrypto/webcrypto.gyp:webcrypto',
1258 '../third_party/re2/re2.gyp:re2', 1262 '../third_party/re2/re2.gyp:re2',
1259 ], 1263 ],
1260 'conditions': [ 1264 'conditions': [
1261 ['OS=="android"', { 1265 ['OS=="android"', {
1266 'sources' : [
1267 '<@(web_restrictions_unittest_sources)',
1268 ],
1262 'dependencies': [ 1269 'dependencies': [
1270 'components_java_test_stubs_jni_headers',
1271 'components.gyp:web_restrictions_browser',
1263 '../build/android/ndk.gyp:cpu_features', 1272 '../build/android/ndk.gyp:cpu_features',
1264 ], 1273 ],
1265 }], 1274 }],
1266 ['OS=="android" and configuration_policy == 1', { 1275 ['OS=="android" and configuration_policy == 1', {
1267 'dependencies': [ 1276 'dependencies': [
1268 'components.gyp:policy_java', 1277 'components.gyp:policy_java',
1269 ], 1278 ],
1270 }], 1279 }],
1271 ['use_openssl==1', { 1280 ['use_openssl==1', {
1272 'dependencies': [ 1281 'dependencies': [
(...skipping 360 matching lines...) Expand 10 before | Expand all | Expand 10 after
1633 }], 1642 }],
1634 ], 1643 ],
1635 }, 1644 },
1636 'includes': [ '../build/apk_browsertest.gypi' ], 1645 'includes': [ '../build/apk_browsertest.gypi' ],
1637 }, 1646 },
1638 { 1647 {
1639 'target_name': 'components_unittests_apk', 1648 'target_name': 'components_unittests_apk',
1640 'isolate_file': 'components_unittests.isolate', 1649 'isolate_file': 'components_unittests.isolate',
1641 'type': 'none', 1650 'type': 'none',
1642 'dependencies': [ 1651 'dependencies': [
1652 'components_java_test_stubs',
1643 'components_unittests', 1653 'components_unittests',
1644 'components.gyp:invalidation_java', 1654 'components.gyp:invalidation_java',
1645 'components.gyp:signin_core_browser_java', 1655 'components.gyp:signin_core_browser_java',
1646 ], 1656 ],
1647 'variables': { 1657 'variables': {
1648 'test_suite_name': 'components_unittests', 1658 'test_suite_name': 'components_unittests',
1649 }, 1659 },
1650 'includes': [ '../build/apk_test.gypi' ], 1660 'includes': [ '../build/apk_test.gypi' ],
1651 }, 1661 },
1652 { 1662 {
1653 'target_name': 'components_junit_tests', 1663 'target_name': 'components_junit_tests',
1654 'type': 'none', 1664 'type': 'none',
1655 'dependencies': [ 1665 'dependencies': [
1656 'components.gyp:invalidation_java', 1666 'components.gyp:invalidation_java',
1657 'components.gyp:policy_java', 1667 'components.gyp:policy_java',
1658 'components.gyp:policy_java_test_support', 1668 'components.gyp:policy_java_test_support',
1659 'components.gyp:web_restrictions_java', 1669 'components.gyp:web_restrictions_java',
1660 '../base/base.gyp:base_java', 1670 '../base/base.gyp:base_java',
1661 '../base/base.gyp:base_java_test_support', 1671 '../base/base.gyp:base_java_test_support',
1662 '../testing/android/junit/junit_test.gyp:junit_test_support', 1672 '../testing/android/junit/junit_test.gyp:junit_test_support',
1663 ], 1673 ],
1664 'variables': { 1674 'variables': {
1665 'main_class': 'org.chromium.testing.local.JunitTestMain', 1675 'main_class': 'org.chromium.testing.local.JunitTestMain',
1666 'src_paths': [ 1676 'src_paths': [
1667 'invalidation/impl/android/junit/', 1677 'invalidation/impl/android/junit/',
1668 'policy/android/junit/', 1678 'policy/android/junit/',
1669 'web_restrictions/junit/' 1679 'web_restrictions/browser/junit/'
1670 ], 1680 ],
1671 }, 1681 },
1672 'includes': [ '../build/host_jar.gypi' ], 1682 'includes': [ '../build/host_jar.gypi' ],
1673 }, 1683 },
1684 {
1685 'target_name': 'components_java_test_stubs_jni_headers',
Bernhard Bauer 2016/02/22 12:39:16 Nit: Usually these are called "test_support" and p
aberent 2016/02/23 13:52:37 Done. Also, for this to make sense, moved to web_r
1686 'type': 'none',
1687 'sources': [
1688 'web_restrictions/browser/javatest/src/org/chromium/components/webre strictions/MockWebRestrictionsClient.java',
1689 ],
1690 'variables': {
1691 'jni_gen_package': 'components/web_restrictions',
1692 },
1693 'includes': [ '../build/jni_generator.gypi' ],
1694 },
1695 {
1696 'target_name': 'components_java_test_stubs',
1697 'type': 'none',
1698 'dependencies': [
1699 'components.gyp:web_restrictions_java',
1700 '../base/base.gyp:base_java',
1701 ],
1702 'variables': {
1703 'java_in_dir': [
1704 'web_restrictions/browser/javatest/'
1705 ],
1706 },
1707 'includes': [ '../build/java.gypi' ],
1708 }
1674 ], 1709 ],
1675 'conditions': [ 1710 'conditions': [
1676 ['test_isolation_mode != "noop"', 1711 ['test_isolation_mode != "noop"',
1677 { 1712 {
1678 'targets': [ 1713 'targets': [
1679 { 1714 {
1680 'target_name': 'components_browsertests_apk_run', 1715 'target_name': 'components_browsertests_apk_run',
1681 'type': 'none', 1716 'type': 'none',
1682 'dependencies': [ 1717 'dependencies': [
1683 'components_browsertests_apk', 1718 'components_browsertests_apk',
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after
1895 'dependencies': [ 1930 'dependencies': [
1896 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 1931 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
1897 ], 1932 ],
1898 }], 1933 }],
1899 ], 1934 ],
1900 }, 1935 },
1901 ], 1936 ],
1902 }], 1937 }],
1903 ], 1938 ],
1904 } 1939 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698