Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2766)

Unified Diff: build/apk_browsertest.gypi

Issue 1401263003: [Android] Add generated runner scripts for browser test suites. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 months 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/apk_browsertest.gypi
diff --git a/build/apk_browsertest.gypi b/build/apk_browsertest.gypi
index 316f52fb853323dfb5fb1eb19d8d0a583e06e705..8cbc4137f597bb19270e131f6aef425da1fcaa7b 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
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698