Chromium Code Reviews| Index: chrome/chrome_android_paks.gypi |
| diff --git a/chrome/chrome_android_paks.gypi b/chrome/chrome_android_paks.gypi |
| index 1ebd36352dcfa5fe4212ea2a7778b30470a677fb..aa3257405db5833640f400642b9cf929912e2881 100644 |
| --- a/chrome/chrome_android_paks.gypi |
| +++ b/chrome/chrome_android_paks.gypi |
| @@ -2,6 +2,7 @@ |
| # Use of this source code is governed by a BSD-style license that can be |
| # found in the LICENSE file. |
| { |
| + 'includes': ['../build/android/v8_external_startup_data_arch_suffix.gypi'], |
| 'variables': { |
| 'chrome_android_pak_output_folder': '<@(PRODUCT_DIR)/assets/<(package_name)', |
| 'chrome_android_pak_input_resources': [ |
| @@ -68,13 +69,9 @@ |
| ], |
| }], |
| ['v8_use_external_startup_data==1', { |
| - 'chrome_android_pak_input_resources': [ |
| - '<(PRODUCT_DIR)/natives_blob.bin', |
| - '<(PRODUCT_DIR)/snapshot_blob.bin', |
| - ], |
| 'chrome_android_pak_output_resources': [ |
| - '<(chrome_android_pak_output_folder)/natives_blob.bin', |
| - '<(chrome_android_pak_output_folder)/snapshot_blob.bin', |
| + '<(chrome_android_pak_output_folder)/natives_blob_<(arch_suffix).bin', |
| + '<(chrome_android_pak_output_folder)/snapshot_blob_<(arch_suffix).bin', |
| ], |
| }], |
| ], |
| @@ -93,6 +90,18 @@ |
| '<@(chrome_android_pak_input_resources)', |
| ], |
| 'clear': 1, |
| + 'conditions': [ |
| + ['v8_use_external_startup_data==1', { |
| + 'renaming_sources': [ |
|
jbudorick
2015/10/19 22:57:23
I'm still not crazy about this interface. I'm wond
michaelbai
2015/10/20 00:10:11
I will keep an eye on how to improve this.
|
| + '<(PRODUCT_DIR)/snapshot_blob.bin', |
| + '<(PRODUCT_DIR)/natives_blob.bin', |
| + ], |
| + 'renaming_destinations': [ |
| + 'snapshot_blob_<(arch_suffix).bin', |
| + 'natives_blob_<(arch_suffix).bin', |
| + ], |
| + }], |
| + ], |
| }, |
| 'includes': ['../build/android/copy_ex.gypi'], |
| }, |