| Index: components/components_tests.gyp
|
| diff --git a/components/components_tests.gyp b/components/components_tests.gyp
|
| index 9ce4ac0e2f19f7d6f1fe3babd5cdb9926866e139..d1a072a30a7d4b3ab2656bf5945e5ba329483f88 100644
|
| --- a/components/components_tests.gyp
|
| +++ b/components/components_tests.gyp
|
| @@ -865,6 +865,10 @@
|
| 'web_resource/promo_resource_service_unittest.cc',
|
| 'web_resource/resource_request_allowed_notifier_unittest.cc',
|
| ],
|
| + 'web_restrictions_unittest_sources' : [
|
| + 'web_restrictions/browser/web_restrictions_client_unittest.cc',
|
| + 'web_restrictions/browser/web_restrictions_resource_throttle_unittest.cc',
|
| + ],
|
| 'webcrypto_unittest_sources': [
|
| 'webcrypto/algorithms/aes_cbc_unittest.cc',
|
| 'webcrypto/algorithms/aes_ctr_unittest.cc',
|
| @@ -1259,7 +1263,11 @@
|
| ],
|
| 'conditions': [
|
| ['OS=="android"', {
|
| + 'sources' : [
|
| + '<@(web_restrictions_unittest_sources)',
|
| + ],
|
| 'dependencies': [
|
| + 'components.gyp:web_restrictions_browser',
|
| '../build/android/ndk.gyp:cpu_features',
|
| ],
|
| }],
|
| @@ -1640,6 +1648,7 @@
|
| 'isolate_file': 'components_unittests.isolate',
|
| 'type': 'none',
|
| 'dependencies': [
|
| + 'components_java_test_stubs',
|
| 'components_unittests',
|
| 'components.gyp:invalidation_java',
|
| 'components.gyp:signin_core_browser_java',
|
| @@ -1666,11 +1675,24 @@
|
| 'src_paths': [
|
| 'invalidation/impl/android/junit/',
|
| 'policy/android/junit/',
|
| - 'web_restrictions/junit/'
|
| + 'web_restrictions/browser/junit/'
|
| ],
|
| },
|
| 'includes': [ '../build/host_jar.gypi' ],
|
| },
|
| + {
|
| + 'target_name': 'components_java_test_stubs',
|
| + 'type': 'none',
|
| + 'dependencies': [
|
| + '../base/base.gyp:base_java',
|
| + ],
|
| + 'variables': {
|
| + 'java_in_dir': [
|
| + 'web_restrictions/browser/javatest/'
|
| + ],
|
| + },
|
| + 'includes': [ '../build/java.gypi' ],
|
| + }
|
| ],
|
| 'conditions': [
|
| ['test_isolation_mode != "noop"',
|
|
|