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

Unified Diff: build/apk_test.gypi

Issue 1120883002: [Android] Generate scripts at build time to run android tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Renamed datadeps to data_deps to reflect recent change. Created 5 years, 7 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 | « build/android/test_runner.gypi ('k') | build/config/android/internal_rules.gni » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/apk_test.gypi
diff --git a/build/apk_test.gypi b/build/apk_test.gypi
index 3a66e3bfd1839da82260e56bb21576e7bb3b511a..2a6d312b632e31551432db34059d692fcbee94b8 100644
--- a/build/apk_test.gypi
+++ b/build/apk_test.gypi
@@ -29,6 +29,7 @@
['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',
@@ -37,7 +38,7 @@
# TODO(yfriedman, cjhopman): Support managed installs for gtests.
'gyp_managed_install': 0,
},
- 'includes': [ 'java_apk.gypi' ],
+ 'includes': [ 'java_apk.gypi', 'android/test_runner.gypi' ],
}], # 'OS == "android"
], # conditions
}
« no previous file with comments | « build/android/test_runner.gypi ('k') | build/config/android/internal_rules.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698