Index: content/content_tests.gypi |
diff --git a/content/content_tests.gypi b/content/content_tests.gypi |
index 9299561495922713d067e6736bedb8420ae3706a..4dbf224d6ed201d6214d76f543d36bc69f4069c5 100644 |
--- a/content/content_tests.gypi |
+++ b/content/content_tests.gypi |
@@ -192,6 +192,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', |
@@ -340,6 +341,7 @@ |
['OS=="android"', { |
'dependencies': [ |
'../ui/shell_dialogs/shell_dialogs.gyp:shell_dialogs', |
+ 'content.gyp:content_v8_external_data', |
], |
}], |
], |
@@ -1615,7 +1617,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' ], |
}, |
{ |
@@ -1625,6 +1648,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', |
@@ -1642,6 +1666,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' ], |
@@ -1669,6 +1699,7 @@ |
'chromium_android_linker_test', |
'content.gyp:content_icudata', |
'content.gyp:content_java', |
+ 'content.gyp:content_v8_external_data', |
'content_shell_java', |
], |
'variables': { |
@@ -1686,6 +1717,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' ], |