Update makefiles after merge of Chromium at 227085

This commit was generated by merge_from_chromium.py.

Change-Id: I95b66ee2d9687bdf14eddc0ce2ec8433407a2b9e
diff --git a/tools/gyp/v8_base.arm.host.darwin-arm.mk b/tools/gyp/v8_base.arm.host.darwin-arm.mk
index dfbf174..c892941 100644
--- a/tools/gyp/v8_base.arm.host.darwin-arm.mk
+++ b/tools/gyp/v8_base.arm.host.darwin-arm.mk
@@ -52,7 +52,6 @@
 	v8/src/dateparser.cc \
 	v8/src/debug-agent.cc \
 	v8/src/debug.cc \
-	v8/src/defaults.cc \
 	v8/src/deoptimizer.cc \
 	v8/src/disassembler.cc \
 	v8/src/diy-fp.cc \
@@ -191,6 +190,7 @@
 	v8/src/arm/simulator-arm.cc \
 	v8/src/arm/stub-cache-arm.cc \
 	v8/src/platform-posix.cc \
+	v8/src/defaults.cc \
 	v8/src/platform-macos.cc
 
 
diff --git a/tools/gyp/v8_base.arm.host.linux-arm.mk b/tools/gyp/v8_base.arm.host.linux-arm.mk
index 8d30c0f..9fbeded 100644
--- a/tools/gyp/v8_base.arm.host.linux-arm.mk
+++ b/tools/gyp/v8_base.arm.host.linux-arm.mk
@@ -52,7 +52,6 @@
 	v8/src/dateparser.cc \
 	v8/src/debug-agent.cc \
 	v8/src/debug.cc \
-	v8/src/defaults.cc \
 	v8/src/deoptimizer.cc \
 	v8/src/disassembler.cc \
 	v8/src/diy-fp.cc \
@@ -191,7 +190,8 @@
 	v8/src/arm/simulator-arm.cc \
 	v8/src/arm/stub-cache-arm.cc \
 	v8/src/platform-posix.cc \
-	v8/src/platform-linux.cc
+	v8/src/platform-linux.cc \
+	v8/src/defaults.cc
 
 
 # Flags passed to both C and C++ files.
diff --git a/tools/gyp/v8_base.arm.target.darwin-arm.mk b/tools/gyp/v8_base.arm.target.darwin-arm.mk
index 6859c36..5ce6c3c 100644
--- a/tools/gyp/v8_base.arm.target.darwin-arm.mk
+++ b/tools/gyp/v8_base.arm.target.darwin-arm.mk
@@ -53,7 +53,6 @@
 	v8/src/dateparser.cc \
 	v8/src/debug-agent.cc \
 	v8/src/debug.cc \
-	v8/src/defaults.cc \
 	v8/src/deoptimizer.cc \
 	v8/src/disassembler.cc \
 	v8/src/diy-fp.cc \
@@ -192,6 +191,7 @@
 	v8/src/arm/simulator-arm.cc \
 	v8/src/arm/stub-cache-arm.cc \
 	v8/src/platform-posix.cc \
+	v8/src/defaults.cc \
 	v8/src/platform-linux.cc
 
 
diff --git a/tools/gyp/v8_base.arm.target.linux-arm.mk b/tools/gyp/v8_base.arm.target.linux-arm.mk
index 6859c36..17ab1ed 100644
--- a/tools/gyp/v8_base.arm.target.linux-arm.mk
+++ b/tools/gyp/v8_base.arm.target.linux-arm.mk
@@ -53,7 +53,6 @@
 	v8/src/dateparser.cc \
 	v8/src/debug-agent.cc \
 	v8/src/debug.cc \
-	v8/src/defaults.cc \
 	v8/src/deoptimizer.cc \
 	v8/src/disassembler.cc \
 	v8/src/diy-fp.cc \
@@ -192,7 +191,8 @@
 	v8/src/arm/simulator-arm.cc \
 	v8/src/arm/stub-cache-arm.cc \
 	v8/src/platform-posix.cc \
-	v8/src/platform-linux.cc
+	v8/src/platform-linux.cc \
+	v8/src/defaults.cc
 
 
 # Flags passed to both C and C++ files.
diff --git a/tools/gyp/v8_base.ia32.host.darwin-x86.mk b/tools/gyp/v8_base.ia32.host.darwin-x86.mk
index c50d062..e5b145f 100644
--- a/tools/gyp/v8_base.ia32.host.darwin-x86.mk
+++ b/tools/gyp/v8_base.ia32.host.darwin-x86.mk
@@ -52,7 +52,6 @@
 	v8/src/dateparser.cc \
 	v8/src/debug-agent.cc \
 	v8/src/debug.cc \
-	v8/src/defaults.cc \
 	v8/src/deoptimizer.cc \
 	v8/src/disassembler.cc \
 	v8/src/diy-fp.cc \
@@ -189,6 +188,7 @@
 	v8/src/ia32/regexp-macro-assembler-ia32.cc \
 	v8/src/ia32/stub-cache-ia32.cc \
 	v8/src/platform-posix.cc \
+	v8/src/defaults.cc \
 	v8/src/platform-macos.cc
 
 
diff --git a/tools/gyp/v8_base.ia32.host.linux-x86.mk b/tools/gyp/v8_base.ia32.host.linux-x86.mk
index bdd852b..8e9bd9f 100644
--- a/tools/gyp/v8_base.ia32.host.linux-x86.mk
+++ b/tools/gyp/v8_base.ia32.host.linux-x86.mk
@@ -52,7 +52,6 @@
 	v8/src/dateparser.cc \
 	v8/src/debug-agent.cc \
 	v8/src/debug.cc \
-	v8/src/defaults.cc \
 	v8/src/deoptimizer.cc \
 	v8/src/disassembler.cc \
 	v8/src/diy-fp.cc \
@@ -189,7 +188,8 @@
 	v8/src/ia32/regexp-macro-assembler-ia32.cc \
 	v8/src/ia32/stub-cache-ia32.cc \
 	v8/src/platform-posix.cc \
-	v8/src/platform-linux.cc
+	v8/src/platform-linux.cc \
+	v8/src/defaults.cc
 
 
 # Flags passed to both C and C++ files.
diff --git a/tools/gyp/v8_base.ia32.target.darwin-x86.mk b/tools/gyp/v8_base.ia32.target.darwin-x86.mk
index 5da7831..6b51ccd 100644
--- a/tools/gyp/v8_base.ia32.target.darwin-x86.mk
+++ b/tools/gyp/v8_base.ia32.target.darwin-x86.mk
@@ -53,7 +53,6 @@
 	v8/src/dateparser.cc \
 	v8/src/debug-agent.cc \
 	v8/src/debug.cc \
-	v8/src/defaults.cc \
 	v8/src/deoptimizer.cc \
 	v8/src/disassembler.cc \
 	v8/src/diy-fp.cc \
@@ -190,6 +189,7 @@
 	v8/src/ia32/regexp-macro-assembler-ia32.cc \
 	v8/src/ia32/stub-cache-ia32.cc \
 	v8/src/platform-posix.cc \
+	v8/src/defaults.cc \
 	v8/src/platform-linux.cc
 
 
diff --git a/tools/gyp/v8_base.ia32.target.linux-x86.mk b/tools/gyp/v8_base.ia32.target.linux-x86.mk
index 5da7831..e9b19e1 100644
--- a/tools/gyp/v8_base.ia32.target.linux-x86.mk
+++ b/tools/gyp/v8_base.ia32.target.linux-x86.mk
@@ -53,7 +53,6 @@
 	v8/src/dateparser.cc \
 	v8/src/debug-agent.cc \
 	v8/src/debug.cc \
-	v8/src/defaults.cc \
 	v8/src/deoptimizer.cc \
 	v8/src/disassembler.cc \
 	v8/src/diy-fp.cc \
@@ -190,7 +189,8 @@
 	v8/src/ia32/regexp-macro-assembler-ia32.cc \
 	v8/src/ia32/stub-cache-ia32.cc \
 	v8/src/platform-posix.cc \
-	v8/src/platform-linux.cc
+	v8/src/platform-linux.cc \
+	v8/src/defaults.cc
 
 
 # Flags passed to both C and C++ files.
diff --git a/tools/gyp/v8_base.mipsel.host.darwin-mips.mk b/tools/gyp/v8_base.mipsel.host.darwin-mips.mk
index a00f1ad..a551264 100644
--- a/tools/gyp/v8_base.mipsel.host.darwin-mips.mk
+++ b/tools/gyp/v8_base.mipsel.host.darwin-mips.mk
@@ -52,7 +52,6 @@
 	v8/src/dateparser.cc \
 	v8/src/debug-agent.cc \
 	v8/src/debug.cc \
-	v8/src/defaults.cc \
 	v8/src/deoptimizer.cc \
 	v8/src/disassembler.cc \
 	v8/src/diy-fp.cc \
@@ -191,6 +190,7 @@
 	v8/src/mips/simulator-mips.cc \
 	v8/src/mips/stub-cache-mips.cc \
 	v8/src/platform-posix.cc \
+	v8/src/defaults.cc \
 	v8/src/platform-macos.cc
 
 
diff --git a/tools/gyp/v8_base.mipsel.host.linux-mips.mk b/tools/gyp/v8_base.mipsel.host.linux-mips.mk
index 811c463..c685d0a 100644
--- a/tools/gyp/v8_base.mipsel.host.linux-mips.mk
+++ b/tools/gyp/v8_base.mipsel.host.linux-mips.mk
@@ -52,7 +52,6 @@
 	v8/src/dateparser.cc \
 	v8/src/debug-agent.cc \
 	v8/src/debug.cc \
-	v8/src/defaults.cc \
 	v8/src/deoptimizer.cc \
 	v8/src/disassembler.cc \
 	v8/src/diy-fp.cc \
@@ -191,7 +190,8 @@
 	v8/src/mips/simulator-mips.cc \
 	v8/src/mips/stub-cache-mips.cc \
 	v8/src/platform-posix.cc \
-	v8/src/platform-linux.cc
+	v8/src/platform-linux.cc \
+	v8/src/defaults.cc
 
 
 # Flags passed to both C and C++ files.
diff --git a/tools/gyp/v8_base.mipsel.target.darwin-mips.mk b/tools/gyp/v8_base.mipsel.target.darwin-mips.mk
index a40e10a..80c42cb 100644
--- a/tools/gyp/v8_base.mipsel.target.darwin-mips.mk
+++ b/tools/gyp/v8_base.mipsel.target.darwin-mips.mk
@@ -53,7 +53,6 @@
 	v8/src/dateparser.cc \
 	v8/src/debug-agent.cc \
 	v8/src/debug.cc \
-	v8/src/defaults.cc \
 	v8/src/deoptimizer.cc \
 	v8/src/disassembler.cc \
 	v8/src/diy-fp.cc \
@@ -192,6 +191,7 @@
 	v8/src/mips/simulator-mips.cc \
 	v8/src/mips/stub-cache-mips.cc \
 	v8/src/platform-posix.cc \
+	v8/src/defaults.cc \
 	v8/src/platform-linux.cc
 
 
diff --git a/tools/gyp/v8_base.mipsel.target.linux-mips.mk b/tools/gyp/v8_base.mipsel.target.linux-mips.mk
index a40e10a..8a70ac7 100644
--- a/tools/gyp/v8_base.mipsel.target.linux-mips.mk
+++ b/tools/gyp/v8_base.mipsel.target.linux-mips.mk
@@ -53,7 +53,6 @@
 	v8/src/dateparser.cc \
 	v8/src/debug-agent.cc \
 	v8/src/debug.cc \
-	v8/src/defaults.cc \
 	v8/src/deoptimizer.cc \
 	v8/src/disassembler.cc \
 	v8/src/diy-fp.cc \
@@ -192,7 +191,8 @@
 	v8/src/mips/simulator-mips.cc \
 	v8/src/mips/stub-cache-mips.cc \
 	v8/src/platform-posix.cc \
-	v8/src/platform-linux.cc
+	v8/src/platform-linux.cc \
+	v8/src/defaults.cc
 
 
 # Flags passed to both C and C++ files.