diff options
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/WebKit/Source/platform/blink_platform_tests.gyp | 15 | ||||
| -rw-r--r-- | third_party/WebKit/Source/web/web_tests.gyp | 9 |
2 files changed, 7 insertions, 17 deletions
diff --git a/third_party/WebKit/Source/platform/blink_platform_tests.gyp b/third_party/WebKit/Source/platform/blink_platform_tests.gyp index ee8e54d..dc7e333 100644 --- a/third_party/WebKit/Source/platform/blink_platform_tests.gyp +++ b/third_party/WebKit/Source/platform/blink_platform_tests.gyp @@ -146,14 +146,10 @@ ], 'variables': { 'dest_path': '<(asset_location)', - 'renaming_sources': [ + 'src_files': [ '<(PRODUCT_DIR)/natives_blob.bin', '<(PRODUCT_DIR)/snapshot_blob.bin', ], - 'renaming_destinations': [ - 'natives_blob_<(arch_suffix).bin', - 'snapshot_blob_<(arch_suffix).bin', - ], 'clear': 1, }, 'includes': ['../../../../build/android/copy_ex.gypi'], @@ -165,16 +161,13 @@ ['v8_use_external_startup_data==1', { 'asset_location': '<(PRODUCT_DIR)/blink_heap_unittests_apk/assets', 'additional_input_paths': [ - '<(PRODUCT_DIR)/blink_heap_unittests_apk/assets/natives_blob_<(arch_suffix).bin', - '<(PRODUCT_DIR)/blink_heap_unittests_apk/assets/snapshot_blob_<(arch_suffix).bin', + '<(PRODUCT_DIR)/blink_heap_unittests_apk/assets/natives_blob.bin', + '<(PRODUCT_DIR)/blink_heap_unittests_apk/assets/snapshot_blob.bin', ], }], ], }, - 'includes': [ - '../../../../build/apk_test.gypi', - '../../../../build/android/v8_external_startup_data_arch_suffix.gypi', - ], + 'includes': [ '../../../../build/apk_test.gypi' ], }, { 'target_name': 'blink_platform_unittests_apk', diff --git a/third_party/WebKit/Source/web/web_tests.gyp b/third_party/WebKit/Source/web/web_tests.gyp index 98807e3..f036b66 100644 --- a/third_party/WebKit/Source/web/web_tests.gyp +++ b/third_party/WebKit/Source/web/web_tests.gyp @@ -153,16 +153,13 @@ 'conditions': [ ['v8_use_external_startup_data==1', { 'additional_input_paths': [ - '<(asset_location)/natives_blob_<(arch_suffix).bin', - '<(asset_location)/snapshot_blob_<(arch_suffix).bin', + '<(asset_location)/natives_blob.bin', + '<(asset_location)/snapshot_blob.bin', ], }], ], }, - 'includes': [ - '../../../../build/apk_test.gypi', - '../../../../build/android/v8_external_startup_data_arch_suffix.gypi', - ], + 'includes': [ '../../../../build/apk_test.gypi' ], }], }], ['test_isolation_mode != "noop"', { |