diff options
Diffstat (limited to 'net/net.gyp')
| -rw-r--r-- | net/net.gyp | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/net/net.gyp b/net/net.gyp index 3241d9a..61b2c75 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -1528,10 +1528,14 @@ ], 'variables': { 'dest_path': '<(asset_location)', - 'src_files': [ + 'renaming_sources': [ '<(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'], @@ -1546,13 +1550,16 @@ ['v8_use_external_startup_data==1', { 'asset_location': '<(PRODUCT_DIR)/net_unittests_apk/assets', 'additional_input_paths': [ - '<(PRODUCT_DIR)/net_unittests_apk/assets/natives_blob.bin', - '<(PRODUCT_DIR)/net_unittests_apk/assets/snapshot_blob.bin', + '<(PRODUCT_DIR)/net_unittests_apk/assets/natives_blob_<(arch_suffix).bin', + '<(PRODUCT_DIR)/net_unittests_apk/assets/snapshot_blob_<(arch_suffix).bin', ], }], ], }, - 'includes': [ '../build/apk_test.gypi' ], + 'includes': [ + '../build/apk_test.gypi', + '../build/android/v8_external_startup_data_arch_suffix.gypi', + ], }, { 'target_name': 'net_junit_tests', |