aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Chromium Automerger <chromium-automerger@android>2014-11-03 11:44:35 +0000
committerAndroid Chromium Automerger <chromium-automerger@android>2014-11-03 11:44:35 +0000
commit116cedd9cb7c6324fc3d3259430024fb271c1a4d (patch)
tree264fb1d7e4a2be5a9f451270b6940489ebe775da
parentc2c3043a75d860a6baf3574b3c61eaf751cb4184 (diff)
downloadv8-116cedd9cb7c6324fc3d3259430024fb271c1a4d.tar.gz
Update makefiles after merge of Chromium at e1c3b8bf8e89
This commit was generated by merge_from_chromium.py. Change-Id: I44752e92c6ede0aec351e7235af6720a398018b7
-rw-r--r--tools/gyp/v8_base.host.darwin-arm.mk2
-rw-r--r--tools/gyp/v8_base.host.darwin-arm64.mk2
-rw-r--r--tools/gyp/v8_base.host.darwin-mips.mk2
-rw-r--r--tools/gyp/v8_base.host.darwin-x86.mk2
-rw-r--r--tools/gyp/v8_base.host.darwin-x86_64.mk2
-rw-r--r--tools/gyp/v8_base.host.linux-arm.mk2
-rw-r--r--tools/gyp/v8_base.host.linux-arm64.mk2
-rw-r--r--tools/gyp/v8_base.host.linux-mips.mk2
-rw-r--r--tools/gyp/v8_base.host.linux-x86.mk2
-rw-r--r--tools/gyp/v8_base.host.linux-x86_64.mk2
-rw-r--r--tools/gyp/v8_base.target.darwin-arm.mk2
-rw-r--r--tools/gyp/v8_base.target.darwin-arm64.mk2
-rw-r--r--tools/gyp/v8_base.target.darwin-mips.mk2
-rw-r--r--tools/gyp/v8_base.target.darwin-x86.mk2
-rw-r--r--tools/gyp/v8_base.target.darwin-x86_64.mk2
-rw-r--r--tools/gyp/v8_base.target.linux-arm.mk2
-rw-r--r--tools/gyp/v8_base.target.linux-arm64.mk2
-rw-r--r--tools/gyp/v8_base.target.linux-mips.mk2
-rw-r--r--tools/gyp/v8_base.target.linux-x86.mk2
-rw-r--r--tools/gyp/v8_base.target.linux-x86_64.mk2
20 files changed, 20 insertions, 20 deletions
diff --git a/tools/gyp/v8_base.host.darwin-arm.mk b/tools/gyp/v8_base.host.darwin-arm.mk
index 356abd6c8..e68a37acb 100644
--- a/tools/gyp/v8_base.host.darwin-arm.mk
+++ b/tools/gyp/v8_base.host.darwin-arm.mk
@@ -40,6 +40,7 @@ LOCAL_SRC_FILES := \
v8/src/basic-block-profiler.cc \
v8/src/bignum-dtoa.cc \
v8/src/bignum.cc \
+ v8/src/bit-vector.cc \
v8/src/bootstrapper.cc \
v8/src/builtins.cc \
v8/src/cached-powers.cc \
@@ -102,7 +103,6 @@ LOCAL_SRC_FILES := \
v8/src/conversions.cc \
v8/src/counters.cc \
v8/src/cpu-profiler.cc \
- v8/src/data-flow.cc \
v8/src/date.cc \
v8/src/dateparser.cc \
v8/src/debug.cc \
diff --git a/tools/gyp/v8_base.host.darwin-arm64.mk b/tools/gyp/v8_base.host.darwin-arm64.mk
index 54b9b54c2..e188643e0 100644
--- a/tools/gyp/v8_base.host.darwin-arm64.mk
+++ b/tools/gyp/v8_base.host.darwin-arm64.mk
@@ -40,6 +40,7 @@ LOCAL_SRC_FILES := \
v8/src/basic-block-profiler.cc \
v8/src/bignum-dtoa.cc \
v8/src/bignum.cc \
+ v8/src/bit-vector.cc \
v8/src/bootstrapper.cc \
v8/src/builtins.cc \
v8/src/cached-powers.cc \
@@ -102,7 +103,6 @@ LOCAL_SRC_FILES := \
v8/src/conversions.cc \
v8/src/counters.cc \
v8/src/cpu-profiler.cc \
- v8/src/data-flow.cc \
v8/src/date.cc \
v8/src/dateparser.cc \
v8/src/debug.cc \
diff --git a/tools/gyp/v8_base.host.darwin-mips.mk b/tools/gyp/v8_base.host.darwin-mips.mk
index 1d6f7783f..12c6e8eb3 100644
--- a/tools/gyp/v8_base.host.darwin-mips.mk
+++ b/tools/gyp/v8_base.host.darwin-mips.mk
@@ -40,6 +40,7 @@ LOCAL_SRC_FILES := \
v8/src/basic-block-profiler.cc \
v8/src/bignum-dtoa.cc \
v8/src/bignum.cc \
+ v8/src/bit-vector.cc \
v8/src/bootstrapper.cc \
v8/src/builtins.cc \
v8/src/cached-powers.cc \
@@ -102,7 +103,6 @@ LOCAL_SRC_FILES := \
v8/src/conversions.cc \
v8/src/counters.cc \
v8/src/cpu-profiler.cc \
- v8/src/data-flow.cc \
v8/src/date.cc \
v8/src/dateparser.cc \
v8/src/debug.cc \
diff --git a/tools/gyp/v8_base.host.darwin-x86.mk b/tools/gyp/v8_base.host.darwin-x86.mk
index 7038fa945..d162fafde 100644
--- a/tools/gyp/v8_base.host.darwin-x86.mk
+++ b/tools/gyp/v8_base.host.darwin-x86.mk
@@ -40,6 +40,7 @@ LOCAL_SRC_FILES := \
v8/src/basic-block-profiler.cc \
v8/src/bignum-dtoa.cc \
v8/src/bignum.cc \
+ v8/src/bit-vector.cc \
v8/src/bootstrapper.cc \
v8/src/builtins.cc \
v8/src/cached-powers.cc \
@@ -102,7 +103,6 @@ LOCAL_SRC_FILES := \
v8/src/conversions.cc \
v8/src/counters.cc \
v8/src/cpu-profiler.cc \
- v8/src/data-flow.cc \
v8/src/date.cc \
v8/src/dateparser.cc \
v8/src/debug.cc \
diff --git a/tools/gyp/v8_base.host.darwin-x86_64.mk b/tools/gyp/v8_base.host.darwin-x86_64.mk
index 576a25cd9..16da89323 100644
--- a/tools/gyp/v8_base.host.darwin-x86_64.mk
+++ b/tools/gyp/v8_base.host.darwin-x86_64.mk
@@ -40,6 +40,7 @@ LOCAL_SRC_FILES := \
v8/src/basic-block-profiler.cc \
v8/src/bignum-dtoa.cc \
v8/src/bignum.cc \
+ v8/src/bit-vector.cc \
v8/src/bootstrapper.cc \
v8/src/builtins.cc \
v8/src/cached-powers.cc \
@@ -102,7 +103,6 @@ LOCAL_SRC_FILES := \
v8/src/conversions.cc \
v8/src/counters.cc \
v8/src/cpu-profiler.cc \
- v8/src/data-flow.cc \
v8/src/date.cc \
v8/src/dateparser.cc \
v8/src/debug.cc \
diff --git a/tools/gyp/v8_base.host.linux-arm.mk b/tools/gyp/v8_base.host.linux-arm.mk
index 356abd6c8..e68a37acb 100644
--- a/tools/gyp/v8_base.host.linux-arm.mk
+++ b/tools/gyp/v8_base.host.linux-arm.mk
@@ -40,6 +40,7 @@ LOCAL_SRC_FILES := \
v8/src/basic-block-profiler.cc \
v8/src/bignum-dtoa.cc \
v8/src/bignum.cc \
+ v8/src/bit-vector.cc \
v8/src/bootstrapper.cc \
v8/src/builtins.cc \
v8/src/cached-powers.cc \
@@ -102,7 +103,6 @@ LOCAL_SRC_FILES := \
v8/src/conversions.cc \
v8/src/counters.cc \
v8/src/cpu-profiler.cc \
- v8/src/data-flow.cc \
v8/src/date.cc \
v8/src/dateparser.cc \
v8/src/debug.cc \
diff --git a/tools/gyp/v8_base.host.linux-arm64.mk b/tools/gyp/v8_base.host.linux-arm64.mk
index 54b9b54c2..e188643e0 100644
--- a/tools/gyp/v8_base.host.linux-arm64.mk
+++ b/tools/gyp/v8_base.host.linux-arm64.mk
@@ -40,6 +40,7 @@ LOCAL_SRC_FILES := \
v8/src/basic-block-profiler.cc \
v8/src/bignum-dtoa.cc \
v8/src/bignum.cc \
+ v8/src/bit-vector.cc \
v8/src/bootstrapper.cc \
v8/src/builtins.cc \
v8/src/cached-powers.cc \
@@ -102,7 +103,6 @@ LOCAL_SRC_FILES := \
v8/src/conversions.cc \
v8/src/counters.cc \
v8/src/cpu-profiler.cc \
- v8/src/data-flow.cc \
v8/src/date.cc \
v8/src/dateparser.cc \
v8/src/debug.cc \
diff --git a/tools/gyp/v8_base.host.linux-mips.mk b/tools/gyp/v8_base.host.linux-mips.mk
index 1d6f7783f..12c6e8eb3 100644
--- a/tools/gyp/v8_base.host.linux-mips.mk
+++ b/tools/gyp/v8_base.host.linux-mips.mk
@@ -40,6 +40,7 @@ LOCAL_SRC_FILES := \
v8/src/basic-block-profiler.cc \
v8/src/bignum-dtoa.cc \
v8/src/bignum.cc \
+ v8/src/bit-vector.cc \
v8/src/bootstrapper.cc \
v8/src/builtins.cc \
v8/src/cached-powers.cc \
@@ -102,7 +103,6 @@ LOCAL_SRC_FILES := \
v8/src/conversions.cc \
v8/src/counters.cc \
v8/src/cpu-profiler.cc \
- v8/src/data-flow.cc \
v8/src/date.cc \
v8/src/dateparser.cc \
v8/src/debug.cc \
diff --git a/tools/gyp/v8_base.host.linux-x86.mk b/tools/gyp/v8_base.host.linux-x86.mk
index 7038fa945..d162fafde 100644
--- a/tools/gyp/v8_base.host.linux-x86.mk
+++ b/tools/gyp/v8_base.host.linux-x86.mk
@@ -40,6 +40,7 @@ LOCAL_SRC_FILES := \
v8/src/basic-block-profiler.cc \
v8/src/bignum-dtoa.cc \
v8/src/bignum.cc \
+ v8/src/bit-vector.cc \
v8/src/bootstrapper.cc \
v8/src/builtins.cc \
v8/src/cached-powers.cc \
@@ -102,7 +103,6 @@ LOCAL_SRC_FILES := \
v8/src/conversions.cc \
v8/src/counters.cc \
v8/src/cpu-profiler.cc \
- v8/src/data-flow.cc \
v8/src/date.cc \
v8/src/dateparser.cc \
v8/src/debug.cc \
diff --git a/tools/gyp/v8_base.host.linux-x86_64.mk b/tools/gyp/v8_base.host.linux-x86_64.mk
index 576a25cd9..16da89323 100644
--- a/tools/gyp/v8_base.host.linux-x86_64.mk
+++ b/tools/gyp/v8_base.host.linux-x86_64.mk
@@ -40,6 +40,7 @@ LOCAL_SRC_FILES := \
v8/src/basic-block-profiler.cc \
v8/src/bignum-dtoa.cc \
v8/src/bignum.cc \
+ v8/src/bit-vector.cc \
v8/src/bootstrapper.cc \
v8/src/builtins.cc \
v8/src/cached-powers.cc \
@@ -102,7 +103,6 @@ LOCAL_SRC_FILES := \
v8/src/conversions.cc \
v8/src/counters.cc \
v8/src/cpu-profiler.cc \
- v8/src/data-flow.cc \
v8/src/date.cc \
v8/src/dateparser.cc \
v8/src/debug.cc \
diff --git a/tools/gyp/v8_base.target.darwin-arm.mk b/tools/gyp/v8_base.target.darwin-arm.mk
index f320a8be3..23b355d22 100644
--- a/tools/gyp/v8_base.target.darwin-arm.mk
+++ b/tools/gyp/v8_base.target.darwin-arm.mk
@@ -40,6 +40,7 @@ LOCAL_SRC_FILES := \
v8/src/basic-block-profiler.cc \
v8/src/bignum-dtoa.cc \
v8/src/bignum.cc \
+ v8/src/bit-vector.cc \
v8/src/bootstrapper.cc \
v8/src/builtins.cc \
v8/src/cached-powers.cc \
@@ -102,7 +103,6 @@ LOCAL_SRC_FILES := \
v8/src/conversions.cc \
v8/src/counters.cc \
v8/src/cpu-profiler.cc \
- v8/src/data-flow.cc \
v8/src/date.cc \
v8/src/dateparser.cc \
v8/src/debug.cc \
diff --git a/tools/gyp/v8_base.target.darwin-arm64.mk b/tools/gyp/v8_base.target.darwin-arm64.mk
index 665e675d0..2cb4cd378 100644
--- a/tools/gyp/v8_base.target.darwin-arm64.mk
+++ b/tools/gyp/v8_base.target.darwin-arm64.mk
@@ -40,6 +40,7 @@ LOCAL_SRC_FILES := \
v8/src/basic-block-profiler.cc \
v8/src/bignum-dtoa.cc \
v8/src/bignum.cc \
+ v8/src/bit-vector.cc \
v8/src/bootstrapper.cc \
v8/src/builtins.cc \
v8/src/cached-powers.cc \
@@ -102,7 +103,6 @@ LOCAL_SRC_FILES := \
v8/src/conversions.cc \
v8/src/counters.cc \
v8/src/cpu-profiler.cc \
- v8/src/data-flow.cc \
v8/src/date.cc \
v8/src/dateparser.cc \
v8/src/debug.cc \
diff --git a/tools/gyp/v8_base.target.darwin-mips.mk b/tools/gyp/v8_base.target.darwin-mips.mk
index 7ac5d0d7b..b9262d1c1 100644
--- a/tools/gyp/v8_base.target.darwin-mips.mk
+++ b/tools/gyp/v8_base.target.darwin-mips.mk
@@ -40,6 +40,7 @@ LOCAL_SRC_FILES := \
v8/src/basic-block-profiler.cc \
v8/src/bignum-dtoa.cc \
v8/src/bignum.cc \
+ v8/src/bit-vector.cc \
v8/src/bootstrapper.cc \
v8/src/builtins.cc \
v8/src/cached-powers.cc \
@@ -102,7 +103,6 @@ LOCAL_SRC_FILES := \
v8/src/conversions.cc \
v8/src/counters.cc \
v8/src/cpu-profiler.cc \
- v8/src/data-flow.cc \
v8/src/date.cc \
v8/src/dateparser.cc \
v8/src/debug.cc \
diff --git a/tools/gyp/v8_base.target.darwin-x86.mk b/tools/gyp/v8_base.target.darwin-x86.mk
index 776573883..6ef9401b1 100644
--- a/tools/gyp/v8_base.target.darwin-x86.mk
+++ b/tools/gyp/v8_base.target.darwin-x86.mk
@@ -40,6 +40,7 @@ LOCAL_SRC_FILES := \
v8/src/basic-block-profiler.cc \
v8/src/bignum-dtoa.cc \
v8/src/bignum.cc \
+ v8/src/bit-vector.cc \
v8/src/bootstrapper.cc \
v8/src/builtins.cc \
v8/src/cached-powers.cc \
@@ -102,7 +103,6 @@ LOCAL_SRC_FILES := \
v8/src/conversions.cc \
v8/src/counters.cc \
v8/src/cpu-profiler.cc \
- v8/src/data-flow.cc \
v8/src/date.cc \
v8/src/dateparser.cc \
v8/src/debug.cc \
diff --git a/tools/gyp/v8_base.target.darwin-x86_64.mk b/tools/gyp/v8_base.target.darwin-x86_64.mk
index ba26b578f..9b3dc2d0a 100644
--- a/tools/gyp/v8_base.target.darwin-x86_64.mk
+++ b/tools/gyp/v8_base.target.darwin-x86_64.mk
@@ -40,6 +40,7 @@ LOCAL_SRC_FILES := \
v8/src/basic-block-profiler.cc \
v8/src/bignum-dtoa.cc \
v8/src/bignum.cc \
+ v8/src/bit-vector.cc \
v8/src/bootstrapper.cc \
v8/src/builtins.cc \
v8/src/cached-powers.cc \
@@ -102,7 +103,6 @@ LOCAL_SRC_FILES := \
v8/src/conversions.cc \
v8/src/counters.cc \
v8/src/cpu-profiler.cc \
- v8/src/data-flow.cc \
v8/src/date.cc \
v8/src/dateparser.cc \
v8/src/debug.cc \
diff --git a/tools/gyp/v8_base.target.linux-arm.mk b/tools/gyp/v8_base.target.linux-arm.mk
index f320a8be3..23b355d22 100644
--- a/tools/gyp/v8_base.target.linux-arm.mk
+++ b/tools/gyp/v8_base.target.linux-arm.mk
@@ -40,6 +40,7 @@ LOCAL_SRC_FILES := \
v8/src/basic-block-profiler.cc \
v8/src/bignum-dtoa.cc \
v8/src/bignum.cc \
+ v8/src/bit-vector.cc \
v8/src/bootstrapper.cc \
v8/src/builtins.cc \
v8/src/cached-powers.cc \
@@ -102,7 +103,6 @@ LOCAL_SRC_FILES := \
v8/src/conversions.cc \
v8/src/counters.cc \
v8/src/cpu-profiler.cc \
- v8/src/data-flow.cc \
v8/src/date.cc \
v8/src/dateparser.cc \
v8/src/debug.cc \
diff --git a/tools/gyp/v8_base.target.linux-arm64.mk b/tools/gyp/v8_base.target.linux-arm64.mk
index 665e675d0..2cb4cd378 100644
--- a/tools/gyp/v8_base.target.linux-arm64.mk
+++ b/tools/gyp/v8_base.target.linux-arm64.mk
@@ -40,6 +40,7 @@ LOCAL_SRC_FILES := \
v8/src/basic-block-profiler.cc \
v8/src/bignum-dtoa.cc \
v8/src/bignum.cc \
+ v8/src/bit-vector.cc \
v8/src/bootstrapper.cc \
v8/src/builtins.cc \
v8/src/cached-powers.cc \
@@ -102,7 +103,6 @@ LOCAL_SRC_FILES := \
v8/src/conversions.cc \
v8/src/counters.cc \
v8/src/cpu-profiler.cc \
- v8/src/data-flow.cc \
v8/src/date.cc \
v8/src/dateparser.cc \
v8/src/debug.cc \
diff --git a/tools/gyp/v8_base.target.linux-mips.mk b/tools/gyp/v8_base.target.linux-mips.mk
index 7ac5d0d7b..b9262d1c1 100644
--- a/tools/gyp/v8_base.target.linux-mips.mk
+++ b/tools/gyp/v8_base.target.linux-mips.mk
@@ -40,6 +40,7 @@ LOCAL_SRC_FILES := \
v8/src/basic-block-profiler.cc \
v8/src/bignum-dtoa.cc \
v8/src/bignum.cc \
+ v8/src/bit-vector.cc \
v8/src/bootstrapper.cc \
v8/src/builtins.cc \
v8/src/cached-powers.cc \
@@ -102,7 +103,6 @@ LOCAL_SRC_FILES := \
v8/src/conversions.cc \
v8/src/counters.cc \
v8/src/cpu-profiler.cc \
- v8/src/data-flow.cc \
v8/src/date.cc \
v8/src/dateparser.cc \
v8/src/debug.cc \
diff --git a/tools/gyp/v8_base.target.linux-x86.mk b/tools/gyp/v8_base.target.linux-x86.mk
index 776573883..6ef9401b1 100644
--- a/tools/gyp/v8_base.target.linux-x86.mk
+++ b/tools/gyp/v8_base.target.linux-x86.mk
@@ -40,6 +40,7 @@ LOCAL_SRC_FILES := \
v8/src/basic-block-profiler.cc \
v8/src/bignum-dtoa.cc \
v8/src/bignum.cc \
+ v8/src/bit-vector.cc \
v8/src/bootstrapper.cc \
v8/src/builtins.cc \
v8/src/cached-powers.cc \
@@ -102,7 +103,6 @@ LOCAL_SRC_FILES := \
v8/src/conversions.cc \
v8/src/counters.cc \
v8/src/cpu-profiler.cc \
- v8/src/data-flow.cc \
v8/src/date.cc \
v8/src/dateparser.cc \
v8/src/debug.cc \
diff --git a/tools/gyp/v8_base.target.linux-x86_64.mk b/tools/gyp/v8_base.target.linux-x86_64.mk
index ba26b578f..9b3dc2d0a 100644
--- a/tools/gyp/v8_base.target.linux-x86_64.mk
+++ b/tools/gyp/v8_base.target.linux-x86_64.mk
@@ -40,6 +40,7 @@ LOCAL_SRC_FILES := \
v8/src/basic-block-profiler.cc \
v8/src/bignum-dtoa.cc \
v8/src/bignum.cc \
+ v8/src/bit-vector.cc \
v8/src/bootstrapper.cc \
v8/src/builtins.cc \
v8/src/cached-powers.cc \
@@ -102,7 +103,6 @@ LOCAL_SRC_FILES := \
v8/src/conversions.cc \
v8/src/counters.cc \
v8/src/cpu-profiler.cc \
- v8/src/data-flow.cc \
v8/src/date.cc \
v8/src/dateparser.cc \
v8/src/debug.cc \