Index: tools/gyp/v8.gyp |
diff --git a/tools/gyp/v8.gyp b/tools/gyp/v8.gyp |
index fe2ba188d6774fc44ffd3d1acc2eb06144db7810..11e1e44d936421640664e314a35e820c43c7582c 100644 |
--- a/tools/gyp/v8.gyp |
+++ b/tools/gyp/v8.gyp |
@@ -180,6 +180,7 @@ |
'sources': [ |
'<(SHARED_INTERMEDIATE_DIR)/libraries.cc', |
'<(SHARED_INTERMEDIATE_DIR)/experimental-libraries.cc', |
+ '<(SHARED_INTERMEDIATE_DIR)/extras-libraries.cc', |
'<(INTERMEDIATE_DIR)/snapshot.cc', |
], |
'actions': [ |
@@ -224,6 +225,7 @@ |
'sources': [ |
'<(SHARED_INTERMEDIATE_DIR)/libraries.cc', |
'<(SHARED_INTERMEDIATE_DIR)/experimental-libraries.cc', |
+ '<(SHARED_INTERMEDIATE_DIR)/extras-libraries.cc', |
'../../src/snapshot/snapshot-empty.cc', |
], |
'conditions': [ |
@@ -1639,6 +1641,7 @@ |
'../../tools/concatenate-files.py', |
'<(SHARED_INTERMEDIATE_DIR)/libraries.bin', |
'<(SHARED_INTERMEDIATE_DIR)/libraries-experimental.bin', |
+ '<(SHARED_INTERMEDIATE_DIR)/libraries-extras.bin', |
], |
'conditions': [ |
['want_separate_host_toolset==1', { |
@@ -1745,6 +1748,7 @@ |
], |
'libraries_bin_file': '<(SHARED_INTERMEDIATE_DIR)/libraries.bin', |
'libraries_experimental_bin_file': '<(SHARED_INTERMEDIATE_DIR)/libraries-experimental.bin', |
+ 'libraries_extras_bin_file': '<(SHARED_INTERMEDIATE_DIR)/libraries-extras.bin', |
}, |
'actions': [ |
{ |
@@ -1752,8 +1756,7 @@ |
'inputs': [ |
'../../tools/js2c.py', |
'<@(library_files)', |
- '<@(i18n_library_files)', |
- '<@(v8_extra_library_files)', |
+ '<@(i18n_library_files)' |
], |
'outputs': [ |
'<(SHARED_INTERMEDIATE_DIR)/libraries.cc', |
@@ -1764,9 +1767,7 @@ |
'<(SHARED_INTERMEDIATE_DIR)/libraries.cc', |
'CORE', |
'<@(library_files)', |
- '<@(i18n_library_files)', |
- '--extra', |
- '<@(v8_extra_library_files)', |
+ '<@(i18n_library_files)' |
], |
'conditions': [ |
[ 'v8_use_external_startup_data==1', { |
@@ -1802,6 +1803,31 @@ |
}], |
], |
}, |
+ { |
+ 'action_name': 'js2c_extras', |
+ 'inputs': [ |
+ '../../tools/js2c.py', |
+ '<@(v8_extra_library_files)', |
+ ], |
+ 'outputs': [ |
+ '<(SHARED_INTERMEDIATE_DIR)/extras-libraries.cc', |
+ ], |
+ 'action': [ |
+ 'python', |
+ '../../tools/js2c.py', |
+ '<(SHARED_INTERMEDIATE_DIR)/extras-libraries.cc', |
+ 'EXTRAS', |
+ '<@(v8_extra_library_files)', |
+ ], |
+ 'conditions': [ |
+ [ 'v8_use_external_startup_data==1', { |
+ 'outputs': ['<@(libraries_extras_bin_file)'], |
+ 'action': [ |
+ '--startup_blob', '<@(libraries_extras_bin_file)', |
+ ], |
+ }], |
+ ], |
+ }, |
], |
}, |
{ |