From 3c58faf8c4b9a59064a800ba6ef437358e708178 Mon Sep 17 00:00:00 2001 From: jbudorick Date: Tue, 13 Oct 2015 11:05:47 -0700 Subject: [PATCH] [Android] Add generated runner scripts for browser test suites. BUG= Review URL: https://codereview.chromium.org/1401263003 Cr-Original-Commit-Position: refs/heads/master@{#353786} Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src Cr-Mirrored-Commit: c870f4c2ad3465a4b64ed79c9aa0aebfe117f775 --- apk_browsertest.gypi | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/apk_browsertest.gypi b/apk_browsertest.gypi index 316f52fb8..8cbc4137f 100644 --- a/apk_browsertest.gypi +++ b/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 }