diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-04-09 14:16:15 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-04-09 14:16:15 -0700 |
| commit | 07a8f9cba51fd4ef012f7773945a72a29f816ba4 (patch) | |
| tree | 8f29131f2d12d5be4107609d8cb60db7dab109c1 | |
| parent | 24a9eb6acf48a10717f03fd8ec0ac8e3df41edfc (diff) | |
| download | pdfium-07a8f9cba51fd4ef012f7773945a72a29f816ba4.tar.xz | |
Merge to XFA: Update DEPS to pull V8 from the new repository.
Original Review URL: https://codereview.chromium.org/1059023003
TBR=thestig@chromium.org
Review URL: https://codereview.chromium.org/1072213002
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | build/standalone.gypi | 13 |
2 files changed, 10 insertions, 5 deletions
@@ -12,7 +12,7 @@ deps = { "https://chromium.googlesource.com/external/googletest.git@8245545b6dc9c4703e6496d1efd19e975ad2b038", "v8": - "https://chromium.googlesource.com/external/v8", + "https://chromium.googlesource.com/v8/v8.git", "v8/third_party/icu": "https://chromium.googlesource.com/chromium/deps/icu46", diff --git a/build/standalone.gypi b/build/standalone.gypi index 645b9f2b7b..8aecd30446 100644 --- a/build/standalone.gypi +++ b/build/standalone.gypi @@ -42,6 +42,7 @@ 'target_arch%': '<(target_arch)', 'werror%': '-Werror', 'v8_optimized_debug%': 0, + 'v8_use_external_startup_data%': 0, 'icu_gyp_path': '../v8/third_party/icu/icu.gyp', 'conditions': [ ['OS == "win"', { @@ -57,7 +58,7 @@ 'Debug': { 'cflags': [ '-g', - '-O0', + '-O0', '-fdata-sections', '-ffunction-sections', ], @@ -140,9 +141,6 @@ 'msvs_configuration_platform': 'x64', }, }, - 'defines!': [ - 'DEBUG', - ], 'cflags': [ '-Wall', '-W', @@ -264,6 +262,13 @@ ], # target_conditions }, # target_defaults }], # OS=="mac" + ['v8_use_external_startup_data==1', { + 'target_defaults': { + 'defines': [ + 'V8_USE_EXTERNAL_STARTUP_DATA', + ], + }, + }], # v8_use_external_startup_data==1 ], 'xcode_settings': { # See comment in Chromium's common.gypi for why this is needed. |