diff options
| author | Steve Block <steveblock@google.com> | 2011-06-13 19:13:29 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-06-13 19:47:33 +0100 |
| commit | 053d10c438f14580aaf4ab1b2aad93a5a4fe8b82 (patch) | |
| tree | 252c105b821e8370a0cc06c168f909e9817a3ebb /tools/gyp | |
| parent | 442c3c4c26c4d864ad9a4948f856e706e77c3cd2 (diff) | |
| download | android_external_v8-053d10c438f14580aaf4ab1b2aad93a5a4fe8b82.tar.gz android_external_v8-053d10c438f14580aaf4ab1b2aad93a5a4fe8b82.tar.bz2 android_external_v8-053d10c438f14580aaf4ab1b2aad93a5a4fe8b82.zip | |
Merge V8 at branches/3.2 r8200: Initial merge by Git
Change-Id: I5c434306e98132997e9c5f6024b6ce200b255edf
Diffstat (limited to 'tools/gyp')
| -rw-r--r-- | tools/gyp/v8.gyp | 26 |
1 files changed, 2 insertions, 24 deletions
diff --git a/tools/gyp/v8.gyp b/tools/gyp/v8.gyp index a11d19a8..77a6194c 100644 --- a/tools/gyp/v8.gyp +++ b/tools/gyp/v8.gyp @@ -230,8 +230,7 @@ '../../src', ], 'sources': [ - '<(SHARED_INTERMEDIATE_DIR)/libraries.cc', - '<(SHARED_INTERMEDIATE_DIR)/experimental-libraries.cc', + '<(SHARED_INTERMEDIATE_DIR)/libraries-empty.cc', '<(INTERMEDIATE_DIR)/snapshot.cc', ], 'actions': [ @@ -260,7 +259,6 @@ ], 'sources': [ '<(SHARED_INTERMEDIATE_DIR)/libraries.cc', - '<(SHARED_INTERMEDIATE_DIR)/experimental-libraries.cc', '../../src/snapshot-empty.cc', ], 'conditions': [ @@ -724,10 +722,6 @@ '../../src/regexp.js', '../../src/macros.py', ], - 'experimental_library_files': [ - '../../src/proxy.js', - '../../src/macros.py', - ], }, 'actions': [ { @@ -738,6 +732,7 @@ ], 'outputs': [ '<(SHARED_INTERMEDIATE_DIR)/libraries.cc', + '<(SHARED_INTERMEDIATE_DIR)/libraries-empty.cc', ], 'action': [ 'python', @@ -747,23 +742,6 @@ '<@(library_files)' ], }, - { - 'action_name': 'js2c_experimental', - 'inputs': [ - '../../tools/js2c.py', - '<@(experimental_library_files)', - ], - 'outputs': [ - '<(SHARED_INTERMEDIATE_DIR)/experimental-libraries.cc', - ], - 'action': [ - 'python', - '../../tools/js2c.py', - '<@(_outputs)', - 'EXPERIMENTAL', - '<@(experimental_library_files)' - ], - }, ], }, { |