| Index: content/content_tests.gypi
|
| diff --git a/content/content_tests.gypi b/content/content_tests.gypi
|
| index 82b1554a37d849b2e31af28d84acccbbca59edd4..b79495a1724c7be51253ed6e31f1ba85d1666066 100644
|
| --- a/content/content_tests.gypi
|
| +++ b/content/content_tests.gypi
|
| @@ -1766,6 +1766,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',
|
| @@ -1806,6 +1807,7 @@
|
| ],
|
| 'variables': {
|
| 'apk_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',
|
| @@ -1988,8 +1990,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
|
|
|