summaryrefslogtreecommitdiffstats
path: root/components/policy.gypi
diff options
context:
space:
mode:
authordgn <dgn@chromium.org>2015-11-10 07:33:50 -0800
committerCommit bot <commit-bot@chromium.org>2015-11-10 15:34:41 +0000
commit738fa38d347a0f3f71a41c23cb4f03618e071d7c (patch)
tree7077acf341277cc5ea55f56e671b7f1cf102e4f0 /components/policy.gypi
parentaf229b2ae84edd77a6c5c40adf5e34c88805d630 (diff)
downloadchromium_src-738fa38d347a0f3f71a41c23cb4f03618e071d7c.zip
chromium_src-738fa38d347a0f3f71a41c23cb4f03618e071d7c.tar.gz
chromium_src-738fa38d347a0f3f71a41c23cb4f03618e071d7c.tar.bz2
Update webview and chrome instrumentation test to use PreTestHooks for policies
- Add utilities to set policies for tests using anotation and pre test hooks - Add AwInstrumentationTestRunner and update ChromeInstrumentationTestRunner to register said hooks - Add classes to simplify building policy bundles BUG=542859 Review URL: https://codereview.chromium.org/1387633002 Cr-Commit-Position: refs/heads/master@{#358829}
Diffstat (limited to 'components/policy.gypi')
-rw-r--r--components/policy.gypi14
1 files changed, 14 insertions, 0 deletions
diff --git a/components/policy.gypi b/components/policy.gypi
index 7788538..6380877 100644
--- a/components/policy.gypi
+++ b/components/policy.gypi
@@ -427,6 +427,20 @@
},
'includes': [ '../build/java.gypi' ],
},
+ {
+ # GN: //components/policy/android:policy_java_test_support
+ 'target_name': 'policy_java_test_support',
+ 'type': 'none',
+ 'dependencies': [
+ '../base/base.gyp:base_java',
+ '../base/base.gyp:base_java_test_support',
+ 'policy_java'
+ ],
+ 'variables': {
+ 'java_in_dir': 'policy/android/javatests',
+ },
+ 'includes': [ '../build/java.gypi' ],
+ },
],
}],
['OS=="win" and target_arch=="ia32" and configuration_policy==1', {