Merge to XFA: Update DEPS to pull V8 from the new repository.
authorTom Sepez <tsepez@chromium.org>
Thu, 9 Apr 2015 21:16:15 +0000 (14:16 -0700)
committerTom Sepez <tsepez@chromium.org>
Thu, 9 Apr 2015 21:16:15 +0000 (14:16 -0700)
Original Review URL: https://codereview.chromium.org/1059023003
TBR=thestig@chromium.org

Review URL: https://codereview.chromium.org/1072213002

DEPS
build/standalone.gypi

diff --git a/DEPS b/DEPS
index 69b0814..88e3a3c 100644 (file)
--- a/DEPS
+++ b/DEPS
@@ -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",
index 645b9f2..8aecd30 100644 (file)
@@ -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',
         ],
         'msvs_configuration_platform': 'x64',
       },
     },
-    'defines!': [
-      'DEBUG',
-    ],
     'cflags': [
       '-Wall',
       '-W',
         ],  # 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.