components/components_tests.gyp - Issue 1387633002: Update instrumentation tests to use PreTestHooks for policies

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: components/components_tests.gyp

Issue 1387633002: Update instrumentation tests to use PreTestHooks for policies (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Address comments, use a map instead of hacking PolicyData's equality Created 5 years, 1 month 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeInstrumentationTestRunner.java ('k') | components/policy.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/components_tests.gyp

diff --git a/components/components_tests.gyp b/components/components_tests.gyp

index 198e0765728aa7447015cea3383db67bb05bc02e..f9975f0302bd17c7ee7855a1d47c70f0b5d0e2fb 100644

--- a/components/components_tests.gyp

+++ b/components/components_tests.gyp

@@ -1567,17 +1567,12 @@

'type': 'none',

'dependencies': [

'components.gyp:invalidation_java',

+ 'components.gyp:policy_java',

+ 'components.gyp:policy_java_test_support',

'../base/base.gyp:base_java',

'../base/base.gyp:base_java_test_support',

'../testing/android/junit/junit_test.gyp:junit_test_support',

- 'conditions': [

- ['configuration_policy == 1', {

- 'dependencies': [

- 'components.gyp:policy_java',

- ],

- }],

- ],

'variables': {

'main_class': 'org.chromium.testing.local.JunitTestMain',

'src_paths': [