| Index: net/net.gyp
|
| diff --git a/net/net.gyp b/net/net.gyp
|
| index 4231043980f700bdaa98f95048aea53c3519ebaf..a4536a9f047b5c34a310986ec5c12c6181724bca 100644
|
| --- a/net/net.gyp
|
| +++ b/net/net.gyp
|
| @@ -1527,13 +1527,9 @@
|
| ],
|
| '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,
|
| },
|
| @@ -1549,16 +1545,13 @@
|
| ['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_<(arch_suffix).bin',
|
| - '<(PRODUCT_DIR)/net_unittests_apk/assets/snapshot_blob_<(arch_suffix).bin',
|
| + '<(PRODUCT_DIR)/net_unittests_apk/assets/natives_blob.bin',
|
| + '<(PRODUCT_DIR)/net_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': 'net_junit_tests',
|
|
|