Index: content/content_tests.gypi |
diff --git a/content/content_tests.gypi b/content/content_tests.gypi |
index 16e475644a65434e3a436f90cc50aad8a8dcac2b..f7ae54e4e652aadda06ed6e2c03781972eb7da18 100644 |
--- a/content/content_tests.gypi |
+++ b/content/content_tests.gypi |
@@ -339,7 +339,9 @@ |
}], |
['OS=="android"', { |
'dependencies': [ |
+ '../gin/gin.gyp:gin', |
'../ui/shell_dialogs/shell_dialogs.gyp:shell_dialogs', |
+ 'content.gyp:content_v8_external_data', |
], |
}], |
], |
@@ -1614,7 +1616,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' ], |
}, |
{ |
@@ -1624,6 +1647,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', |
@@ -1641,6 +1665,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' ], |
@@ -1668,6 +1698,7 @@ |
'chromium_android_linker_test', |
'content.gyp:content_icudata', |
'content.gyp:content_java', |
+ 'content.gyp:content_v8_external_data', |
'content_shell_java', |
], |
'variables': { |
@@ -1685,6 +1716,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' ], |