diff options
| author | jbudorick <jbudorick@chromium.org> | 2015-10-13 11:05:47 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-13 18:07:53 +0000 |
| commit | c870f4c2ad3465a4b64ed79c9aa0aebfe117f775 (patch) | |
| tree | 78c7ecbf7f402d1708ed87d8db894c1a70940287 /build | |
| parent | 9f0bb323d1b080be08797b13fa77e2d6153c5800 (diff) | |
| download | chromium_src-c870f4c2ad3465a4b64ed79c9aa0aebfe117f775.zip chromium_src-c870f4c2ad3465a4b64ed79c9aa0aebfe117f775.tar.gz chromium_src-c870f4c2ad3465a4b64ed79c9aa0aebfe117f775.tar.bz2 | |
[Android] Add generated runner scripts for browser test suites.
BUG=
Review URL: https://codereview.chromium.org/1401263003
Cr-Commit-Position: refs/heads/master@{#353786}
Diffstat (limited to 'build')
| -rw-r--r-- | build/apk_browsertest.gypi | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/build/apk_browsertest.gypi b/build/apk_browsertest.gypi index 316f52f..8cbc413 100644 --- a/build/apk_browsertest.gypi +++ b/build/apk_browsertest.gypi @@ -27,17 +27,18 @@ '<(DEPTH)/tools/android/android_tools.gyp:android_tools', ], 'conditions': [ - ['OS == "android"', { - 'variables': { - # These are used to configure java_apk.gypi included below. - 'apk_name': '<(test_suite_name)', - 'intermediate_dir': '<(PRODUCT_DIR)/<(test_suite_name)_apk', - 'final_apk_path': '<(intermediate_dir)/<(test_suite_name)-debug.apk', - 'native_lib_target': 'lib<(test_suite_name)', - # TODO(yfriedman, cjhopman): Support managed installs for gtests. - 'gyp_managed_install': 0, - }, - 'includes': [ 'java_apk.gypi' ], - }], # 'OS == "android" + ['OS == "android"', { + 'variables': { + # These are used to configure java_apk.gypi included below. + 'test_type': 'gtest', + 'apk_name': '<(test_suite_name)', + 'intermediate_dir': '<(PRODUCT_DIR)/<(test_suite_name)_apk', + 'final_apk_path': '<(intermediate_dir)/<(test_suite_name)-debug.apk', + 'native_lib_target': 'lib<(test_suite_name)', + # TODO(yfriedman, cjhopman): Support managed installs for gtests. + 'gyp_managed_install': 0, + }, + 'includes': [ 'java_apk.gypi', 'android/test_runner.gypi' ], + }], # 'OS == "android" ], # conditions } |