Index: content/content_tests.gypi |
diff --git a/content/content_tests.gypi b/content/content_tests.gypi |
index cc0562c91e8f6f7dd06d722063e3da420a04627f..5b599c78d54754abf1c97bdb2a6850650053b3f4 100644 |
--- a/content/content_tests.gypi |
+++ b/content/content_tests.gypi |
@@ -1015,7 +1015,7 @@ |
'dependencies': [ |
'../ui/android/ui_android.gyp:ui_android', |
'../ui/shell_dialogs/shell_dialogs.gyp:shell_dialogs', |
- 'content.gyp:content_v8_external_data', |
+ 'content.gyp:content_shell_assets_copy', |
], |
}], |
['v8_use_external_startup_data==1 and OS!="ios"', { |
@@ -1872,15 +1872,15 @@ |
'dependencies': [ |
'../v8/tools/gyp/v8.gyp:v8_external_snapshot', |
], |
- 'copies': [ |
- { |
- 'destination': '<(asset_location)', |
- 'files': [ |
- '<(PRODUCT_DIR)/natives_blob.bin', |
- '<(PRODUCT_DIR)/snapshot_blob.bin', |
- ], |
- }, |
- ], |
+ 'variables': { |
+ 'dest_path': '<(asset_location)', |
+ 'src_files': [ |
+ '<(PRODUCT_DIR)/natives_blob.bin', |
+ '<(PRODUCT_DIR)/snapshot_blob.bin', |
+ ], |
+ 'clear': 1, |
+ }, |
+ 'includes': ['../build/android/copy_ex.gypi'], |
}], |
], |
'variables': { |
@@ -1928,9 +1928,8 @@ |
'target_name': 'content_browsertests_apk', |
'type': 'none', |
'dependencies': [ |
- 'content.gyp:content_icudata', |
+ 'content.gyp:content_shell_assets_copy', |
'content.gyp:content_java', |
- 'content.gyp:content_v8_external_data', |
'content_browsertests', |
'content_shell_browsertests_java', |
'content_java_test_support', |
@@ -1996,9 +1995,8 @@ |
['target_arch != "x64"', { |
'dependencies': [ |
'chromium_android_linker_test', |
- 'content.gyp:content_icudata', |
+ 'content.gyp:content_shell_assets_copy', |
'content.gyp:content_java', |
- 'content.gyp:content_v8_external_data', |
'content_shell_java', |
], |
'variables': { |