| Index: content/content_tests.gypi
|
| diff --git a/content/content_tests.gypi b/content/content_tests.gypi
|
| index 56b6f715b7bfbdc9cfe139402378f684c3c1fe79..192584a530556cad0c35dc39d3ceb6c9026bd443 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',
|
| @@ -209,6 +210,7 @@
|
| 'content.gyp:content_app_both',
|
| 'content.gyp:content_browser',
|
| 'content.gyp:content_common',
|
| + 'content.gyp:content_v8_external_data',
|
| ],
|
| 'include_dirs': [
|
| '..',
|
| @@ -1032,6 +1034,7 @@
|
| 'test_support_content',
|
| '../base/base.gyp:test_support_base',
|
| '../cc/cc.gyp:cc',
|
| + '../gin/gin.gyp:gin',
|
| '../skia/skia.gyp:skia',
|
| '../testing/gtest.gyp:gtest',
|
| '../testing/perf/perf_test.gyp:*',
|
| @@ -1396,6 +1399,7 @@
|
| 'content.gyp:content_common',
|
| 'test_support_content',
|
| '../base/base.gyp:test_support_base',
|
| + '../gin/gin.gyp:gin',
|
| '../gpu/gpu.gyp:command_buffer_common',
|
| '../testing/gtest.gyp:gtest',
|
| '../third_party/WebKit/public/blink.gyp:blink',
|
| @@ -1434,6 +1438,7 @@
|
| 'content.gyp:content_common',
|
| 'test_support_content',
|
| '../base/base.gyp:test_support_base',
|
| + '../gin/gin.gyp:gin',
|
| '../testing/gtest.gyp:gtest',
|
| '../third_party/WebKit/public/blink.gyp:blink',
|
| '../ui/base/ui_base.gyp:ui_base',
|
| @@ -1609,7 +1614,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 +1645,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 +1663,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 +1696,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 +1714,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' ],
|
|
|