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

Unified Diff: content/content_tests.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 | « components/components_tests.gyp ('k') | content/shell/android/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/content_tests.gypi
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index 0a000db647e979570a01ca202e6853e0a314afa0..b7598defdfae0ff6b9067d0cde813f46ae0036a7 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -1765,6 +1765,7 @@
],
'variables': {
'test_suite_name': 'content_unittests',
+ 'isolate_file': 'content_unittests.isolate',
'conditions': [
['v8_use_external_startup_data==1', {
'asset_location': '<(PRODUCT_DIR)/content_unittests_apk/assets',
@@ -1805,6 +1806,7 @@
],
'variables': {
'test_suite_name': 'content_browsertests',
+ 'isolate_file': 'content_browsertests.isolate',
'java_in_dir': 'shell/android/browsertests_apk',
'android_manifest_path': '<(SHARED_INTERMEDIATE_DIR)/content_browsertests_manifest/AndroidManifest.xml',
'resource_dir': 'shell/android/browsertests_apk/res',
@@ -1986,8 +1988,13 @@
'resource_dir': 'shell/android/shell_apk/res',
'additional_src_dirs': ['public/android/javatests/', ],
'is_test_apk': 1,
+ 'test_type': 'instrumentation',
+ 'isolate_file': 'content_shell_test_apk.isolate',
},
- 'includes': [ '../build/java_apk.gypi' ],
+ 'includes': [
+ '../build/java_apk.gypi',
+ '../build/android/test_runner.gypi',
+ ],
},
{
# GN: //content/public/android:content_junit_tests
« no previous file with comments | « components/components_tests.gyp ('k') | content/shell/android/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698