| Index: content/content_tests.gypi
|
| diff --git a/content/content_tests.gypi b/content/content_tests.gypi
|
| index 84ab7f4a686a9e3b9cbe87ff16c5ef55a551e407..b5c975a7663f8162eced847c21cc3bc76610570e 100644
|
| --- a/content/content_tests.gypi
|
| +++ b/content/content_tests.gypi
|
| @@ -190,6 +190,7 @@
|
| 'target_name': 'test_support_content',
|
| 'type': 'static_library',
|
| 'dependencies': [
|
| + '../gin/gin.gyp:gin',
|
| '../net/net.gyp:net_test_support',
|
| '../skia/skia.gyp:skia',
|
| '../storage/storage_common.gyp:storage_common',
|
| @@ -338,6 +339,7 @@
|
| ['OS=="android"', {
|
| 'dependencies': [
|
| '../ui/shell_dialogs/shell_dialogs.gyp:shell_dialogs',
|
| + 'content.gyp:content_v8_external_data',
|
| ],
|
| }],
|
| ],
|
| @@ -1609,7 +1611,28 @@
|
| ],
|
| 'variables': {
|
| 'test_suite_name': 'content_unittests',
|
| + 'conditions': [
|
| + ['v8_use_external_startup_data==1', {
|
| + 'additional_input_paths': [
|
| + '<(PRODUCT_DIR)/natives_blob.bin',
|
| + '<(PRODUCT_DIR)/snapshot_blob.bin',
|
| + ],
|
| + }],
|
| + ],
|
| },
|
| + 'copies': [
|
| + {
|
| + 'destination': '<(PRODUCT_DIR)/content_unittests_apk/assets',
|
| + 'conditions': [
|
| + ['v8_use_external_startup_data==1', {
|
| + 'files': [
|
| + '<(PRODUCT_DIR)/natives_blob.bin',
|
| + '<(PRODUCT_DIR)/snapshot_blob.bin',
|
| + ],
|
| + }],
|
| + ],
|
| + },
|
| + ],
|
| 'includes': [ '../build/apk_test.gypi' ],
|
| },
|
| {
|
| @@ -1619,6 +1642,7 @@
|
| 'dependencies': [
|
| 'content.gyp:content_icudata',
|
| 'content.gyp:content_java',
|
| + 'content.gyp:content_v8_external_data',
|
| 'content_browsertests',
|
| 'content_java_test_support',
|
| 'content_shell_java',
|
| @@ -1636,6 +1660,12 @@
|
| '<(PRODUCT_DIR)/icudtl.dat',
|
| ],
|
| }],
|
| + ['v8_use_external_startup_data==1', {
|
| + 'additional_input_paths': [
|
| + '<(PRODUCT_DIR)/natives_blob.bin',
|
| + '<(PRODUCT_DIR)/snapshot_blob.bin',
|
| + ],
|
| + }],
|
| ],
|
| },
|
| 'includes': [ '../build/java_apk.gypi' ],
|
| @@ -1663,6 +1693,7 @@
|
| 'chromium_android_linker_test',
|
| 'content.gyp:content_icudata',
|
| 'content.gyp:content_java',
|
| + 'content.gyp:content_v8_external_data',
|
| 'content_shell_java',
|
| ],
|
| 'variables': {
|
| @@ -1680,6 +1711,12 @@
|
| '<(PRODUCT_DIR)/icudtl.dat',
|
| ],
|
| }],
|
| + ['v8_use_external_startup_data==1', {
|
| + 'additional_input_paths': [
|
| + '<(PRODUCT_DIR)/natives_blob.bin',
|
| + '<(PRODUCT_DIR)/snapshot_blob.bin',
|
| + ],
|
| + }],
|
| ],
|
| },
|
| 'includes': [ '../build/java_apk.gypi' ],
|
|
|