Update makefiles after merge of Chromium at r218744
This commit was generated by merge_from_chromium.py.
Change-Id: I3b9f239cdb944c1f21c4e25a9b17cb640da052d9
diff --git a/tools/gyp/js2c.host.darwin-arm.mk b/tools/gyp/js2c.host.darwin-arm.mk
index 6d3de6d..ba96fdb 100644
--- a/tools/gyp/js2c.host.darwin-arm.mk
+++ b/tools/gyp/js2c.host.darwin-arm.mk
@@ -19,9 +19,9 @@
$(gyp_shared_intermediate_dir)/libraries.cc: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir))
$(gyp_shared_intermediate_dir)/libraries.cc: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
$(gyp_shared_intermediate_dir)/libraries.cc: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
-$(gyp_shared_intermediate_dir)/libraries.cc: $(LOCAL_PATH)/v8/tools/js2c.py $(LOCAL_PATH)/v8/src/runtime.js $(LOCAL_PATH)/v8/src/v8natives.js $(LOCAL_PATH)/v8/src/array.js $(LOCAL_PATH)/v8/src/string.js $(LOCAL_PATH)/v8/src/uri.js $(LOCAL_PATH)/v8/src/math.js $(LOCAL_PATH)/v8/src/messages.js $(LOCAL_PATH)/v8/src/apinatives.js $(LOCAL_PATH)/v8/src/debug-debugger.js $(LOCAL_PATH)/v8/src/mirror-debugger.js $(LOCAL_PATH)/v8/src/liveedit-debugger.js $(LOCAL_PATH)/v8/src/date.js $(LOCAL_PATH)/v8/src/json.js $(LOCAL_PATH)/v8/src/regexp.js $(LOCAL_PATH)/v8/src/macros.py $(GYP_TARGET_DEPENDENCIES)
+$(gyp_shared_intermediate_dir)/libraries.cc: $(LOCAL_PATH)/v8/tools/js2c.py $(LOCAL_PATH)/v8/src/runtime.js $(LOCAL_PATH)/v8/src/v8natives.js $(LOCAL_PATH)/v8/src/array.js $(LOCAL_PATH)/v8/src/string.js $(LOCAL_PATH)/v8/src/uri.js $(LOCAL_PATH)/v8/src/math.js $(LOCAL_PATH)/v8/src/messages.js $(LOCAL_PATH)/v8/src/apinatives.js $(LOCAL_PATH)/v8/src/debug-debugger.js $(LOCAL_PATH)/v8/src/mirror-debugger.js $(LOCAL_PATH)/v8/src/liveedit-debugger.js $(LOCAL_PATH)/v8/src/date.js $(LOCAL_PATH)/v8/src/json.js $(LOCAL_PATH)/v8/src/regexp.js $(LOCAL_PATH)/v8/src/arraybuffer.js $(LOCAL_PATH)/v8/src/typedarray.js $(LOCAL_PATH)/v8/src/macros.py $(GYP_TARGET_DEPENDENCIES)
@echo "Gyp action: v8_tools_gyp_v8_gyp_js2c_host_js2c ($@)"
- $(hide)cd $(gyp_local_path)/v8/tools/gyp; mkdir -p $(gyp_shared_intermediate_dir); python ../../tools/js2c.py "$(gyp_shared_intermediate_dir)/libraries.cc" CORE off ../../src/runtime.js ../../src/v8natives.js ../../src/array.js ../../src/string.js ../../src/uri.js ../../src/math.js ../../src/messages.js ../../src/apinatives.js ../../src/debug-debugger.js ../../src/mirror-debugger.js ../../src/liveedit-debugger.js ../../src/date.js ../../src/json.js ../../src/regexp.js ../../src/macros.py
+ $(hide)cd $(gyp_local_path)/v8/tools/gyp; mkdir -p $(gyp_shared_intermediate_dir); python ../../tools/js2c.py "$(gyp_shared_intermediate_dir)/libraries.cc" CORE off ../../src/runtime.js ../../src/v8natives.js ../../src/array.js ../../src/string.js ../../src/uri.js ../../src/math.js ../../src/messages.js ../../src/apinatives.js ../../src/debug-debugger.js ../../src/mirror-debugger.js ../../src/liveedit-debugger.js ../../src/date.js ../../src/json.js ../../src/regexp.js ../../src/arraybuffer.js ../../src/typedarray.js ../../src/macros.py
### Rules for action "js2c_experimental":
@@ -29,9 +29,9 @@
$(gyp_shared_intermediate_dir)/experimental-libraries.cc: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir))
$(gyp_shared_intermediate_dir)/experimental-libraries.cc: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
$(gyp_shared_intermediate_dir)/experimental-libraries.cc: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
-$(gyp_shared_intermediate_dir)/experimental-libraries.cc: $(LOCAL_PATH)/v8/tools/js2c.py $(LOCAL_PATH)/v8/src/macros.py $(LOCAL_PATH)/v8/src/symbol.js $(LOCAL_PATH)/v8/src/proxy.js $(LOCAL_PATH)/v8/src/collection.js $(LOCAL_PATH)/v8/src/object-observe.js $(LOCAL_PATH)/v8/src/arraybuffer.js $(LOCAL_PATH)/v8/src/typedarray.js $(LOCAL_PATH)/v8/src/generator.js $(LOCAL_PATH)/v8/src/array-iterator.js $(LOCAL_PATH)/v8/src/harmony-string.js $(LOCAL_PATH)/v8/src/harmony-array.js $(GYP_TARGET_DEPENDENCIES)
+$(gyp_shared_intermediate_dir)/experimental-libraries.cc: $(LOCAL_PATH)/v8/tools/js2c.py $(LOCAL_PATH)/v8/src/macros.py $(LOCAL_PATH)/v8/src/symbol.js $(LOCAL_PATH)/v8/src/proxy.js $(LOCAL_PATH)/v8/src/collection.js $(LOCAL_PATH)/v8/src/object-observe.js $(LOCAL_PATH)/v8/src/generator.js $(LOCAL_PATH)/v8/src/array-iterator.js $(LOCAL_PATH)/v8/src/harmony-string.js $(LOCAL_PATH)/v8/src/harmony-array.js $(GYP_TARGET_DEPENDENCIES)
@echo "Gyp action: v8_tools_gyp_v8_gyp_js2c_host_js2c_experimental ($@)"
- $(hide)cd $(gyp_local_path)/v8/tools/gyp; mkdir -p $(gyp_shared_intermediate_dir); python ../../tools/js2c.py "$(gyp_shared_intermediate_dir)/experimental-libraries.cc" EXPERIMENTAL off ../../src/macros.py ../../src/symbol.js ../../src/proxy.js ../../src/collection.js ../../src/object-observe.js ../../src/arraybuffer.js ../../src/typedarray.js ../../src/generator.js ../../src/array-iterator.js ../../src/harmony-string.js ../../src/harmony-array.js
+ $(hide)cd $(gyp_local_path)/v8/tools/gyp; mkdir -p $(gyp_shared_intermediate_dir); python ../../tools/js2c.py "$(gyp_shared_intermediate_dir)/experimental-libraries.cc" EXPERIMENTAL off ../../src/macros.py ../../src/symbol.js ../../src/proxy.js ../../src/collection.js ../../src/object-observe.js ../../src/generator.js ../../src/array-iterator.js ../../src/harmony-string.js ../../src/harmony-array.js
### Rules for action "js2c_i18n":
diff --git a/tools/gyp/js2c.host.darwin-mips.mk b/tools/gyp/js2c.host.darwin-mips.mk
index 6d3de6d..ba96fdb 100644
--- a/tools/gyp/js2c.host.darwin-mips.mk
+++ b/tools/gyp/js2c.host.darwin-mips.mk
@@ -19,9 +19,9 @@
$(gyp_shared_intermediate_dir)/libraries.cc: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir))
$(gyp_shared_intermediate_dir)/libraries.cc: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
$(gyp_shared_intermediate_dir)/libraries.cc: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
-$(gyp_shared_intermediate_dir)/libraries.cc: $(LOCAL_PATH)/v8/tools/js2c.py $(LOCAL_PATH)/v8/src/runtime.js $(LOCAL_PATH)/v8/src/v8natives.js $(LOCAL_PATH)/v8/src/array.js $(LOCAL_PATH)/v8/src/string.js $(LOCAL_PATH)/v8/src/uri.js $(LOCAL_PATH)/v8/src/math.js $(LOCAL_PATH)/v8/src/messages.js $(LOCAL_PATH)/v8/src/apinatives.js $(LOCAL_PATH)/v8/src/debug-debugger.js $(LOCAL_PATH)/v8/src/mirror-debugger.js $(LOCAL_PATH)/v8/src/liveedit-debugger.js $(LOCAL_PATH)/v8/src/date.js $(LOCAL_PATH)/v8/src/json.js $(LOCAL_PATH)/v8/src/regexp.js $(LOCAL_PATH)/v8/src/macros.py $(GYP_TARGET_DEPENDENCIES)
+$(gyp_shared_intermediate_dir)/libraries.cc: $(LOCAL_PATH)/v8/tools/js2c.py $(LOCAL_PATH)/v8/src/runtime.js $(LOCAL_PATH)/v8/src/v8natives.js $(LOCAL_PATH)/v8/src/array.js $(LOCAL_PATH)/v8/src/string.js $(LOCAL_PATH)/v8/src/uri.js $(LOCAL_PATH)/v8/src/math.js $(LOCAL_PATH)/v8/src/messages.js $(LOCAL_PATH)/v8/src/apinatives.js $(LOCAL_PATH)/v8/src/debug-debugger.js $(LOCAL_PATH)/v8/src/mirror-debugger.js $(LOCAL_PATH)/v8/src/liveedit-debugger.js $(LOCAL_PATH)/v8/src/date.js $(LOCAL_PATH)/v8/src/json.js $(LOCAL_PATH)/v8/src/regexp.js $(LOCAL_PATH)/v8/src/arraybuffer.js $(LOCAL_PATH)/v8/src/typedarray.js $(LOCAL_PATH)/v8/src/macros.py $(GYP_TARGET_DEPENDENCIES)
@echo "Gyp action: v8_tools_gyp_v8_gyp_js2c_host_js2c ($@)"
- $(hide)cd $(gyp_local_path)/v8/tools/gyp; mkdir -p $(gyp_shared_intermediate_dir); python ../../tools/js2c.py "$(gyp_shared_intermediate_dir)/libraries.cc" CORE off ../../src/runtime.js ../../src/v8natives.js ../../src/array.js ../../src/string.js ../../src/uri.js ../../src/math.js ../../src/messages.js ../../src/apinatives.js ../../src/debug-debugger.js ../../src/mirror-debugger.js ../../src/liveedit-debugger.js ../../src/date.js ../../src/json.js ../../src/regexp.js ../../src/macros.py
+ $(hide)cd $(gyp_local_path)/v8/tools/gyp; mkdir -p $(gyp_shared_intermediate_dir); python ../../tools/js2c.py "$(gyp_shared_intermediate_dir)/libraries.cc" CORE off ../../src/runtime.js ../../src/v8natives.js ../../src/array.js ../../src/string.js ../../src/uri.js ../../src/math.js ../../src/messages.js ../../src/apinatives.js ../../src/debug-debugger.js ../../src/mirror-debugger.js ../../src/liveedit-debugger.js ../../src/date.js ../../src/json.js ../../src/regexp.js ../../src/arraybuffer.js ../../src/typedarray.js ../../src/macros.py
### Rules for action "js2c_experimental":
@@ -29,9 +29,9 @@
$(gyp_shared_intermediate_dir)/experimental-libraries.cc: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir))
$(gyp_shared_intermediate_dir)/experimental-libraries.cc: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
$(gyp_shared_intermediate_dir)/experimental-libraries.cc: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
-$(gyp_shared_intermediate_dir)/experimental-libraries.cc: $(LOCAL_PATH)/v8/tools/js2c.py $(LOCAL_PATH)/v8/src/macros.py $(LOCAL_PATH)/v8/src/symbol.js $(LOCAL_PATH)/v8/src/proxy.js $(LOCAL_PATH)/v8/src/collection.js $(LOCAL_PATH)/v8/src/object-observe.js $(LOCAL_PATH)/v8/src/arraybuffer.js $(LOCAL_PATH)/v8/src/typedarray.js $(LOCAL_PATH)/v8/src/generator.js $(LOCAL_PATH)/v8/src/array-iterator.js $(LOCAL_PATH)/v8/src/harmony-string.js $(LOCAL_PATH)/v8/src/harmony-array.js $(GYP_TARGET_DEPENDENCIES)
+$(gyp_shared_intermediate_dir)/experimental-libraries.cc: $(LOCAL_PATH)/v8/tools/js2c.py $(LOCAL_PATH)/v8/src/macros.py $(LOCAL_PATH)/v8/src/symbol.js $(LOCAL_PATH)/v8/src/proxy.js $(LOCAL_PATH)/v8/src/collection.js $(LOCAL_PATH)/v8/src/object-observe.js $(LOCAL_PATH)/v8/src/generator.js $(LOCAL_PATH)/v8/src/array-iterator.js $(LOCAL_PATH)/v8/src/harmony-string.js $(LOCAL_PATH)/v8/src/harmony-array.js $(GYP_TARGET_DEPENDENCIES)
@echo "Gyp action: v8_tools_gyp_v8_gyp_js2c_host_js2c_experimental ($@)"
- $(hide)cd $(gyp_local_path)/v8/tools/gyp; mkdir -p $(gyp_shared_intermediate_dir); python ../../tools/js2c.py "$(gyp_shared_intermediate_dir)/experimental-libraries.cc" EXPERIMENTAL off ../../src/macros.py ../../src/symbol.js ../../src/proxy.js ../../src/collection.js ../../src/object-observe.js ../../src/arraybuffer.js ../../src/typedarray.js ../../src/generator.js ../../src/array-iterator.js ../../src/harmony-string.js ../../src/harmony-array.js
+ $(hide)cd $(gyp_local_path)/v8/tools/gyp; mkdir -p $(gyp_shared_intermediate_dir); python ../../tools/js2c.py "$(gyp_shared_intermediate_dir)/experimental-libraries.cc" EXPERIMENTAL off ../../src/macros.py ../../src/symbol.js ../../src/proxy.js ../../src/collection.js ../../src/object-observe.js ../../src/generator.js ../../src/array-iterator.js ../../src/harmony-string.js ../../src/harmony-array.js
### Rules for action "js2c_i18n":
diff --git a/tools/gyp/js2c.host.darwin-x86.mk b/tools/gyp/js2c.host.darwin-x86.mk
index 6d3de6d..ba96fdb 100644
--- a/tools/gyp/js2c.host.darwin-x86.mk
+++ b/tools/gyp/js2c.host.darwin-x86.mk
@@ -19,9 +19,9 @@
$(gyp_shared_intermediate_dir)/libraries.cc: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir))
$(gyp_shared_intermediate_dir)/libraries.cc: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
$(gyp_shared_intermediate_dir)/libraries.cc: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
-$(gyp_shared_intermediate_dir)/libraries.cc: $(LOCAL_PATH)/v8/tools/js2c.py $(LOCAL_PATH)/v8/src/runtime.js $(LOCAL_PATH)/v8/src/v8natives.js $(LOCAL_PATH)/v8/src/array.js $(LOCAL_PATH)/v8/src/string.js $(LOCAL_PATH)/v8/src/uri.js $(LOCAL_PATH)/v8/src/math.js $(LOCAL_PATH)/v8/src/messages.js $(LOCAL_PATH)/v8/src/apinatives.js $(LOCAL_PATH)/v8/src/debug-debugger.js $(LOCAL_PATH)/v8/src/mirror-debugger.js $(LOCAL_PATH)/v8/src/liveedit-debugger.js $(LOCAL_PATH)/v8/src/date.js $(LOCAL_PATH)/v8/src/json.js $(LOCAL_PATH)/v8/src/regexp.js $(LOCAL_PATH)/v8/src/macros.py $(GYP_TARGET_DEPENDENCIES)
+$(gyp_shared_intermediate_dir)/libraries.cc: $(LOCAL_PATH)/v8/tools/js2c.py $(LOCAL_PATH)/v8/src/runtime.js $(LOCAL_PATH)/v8/src/v8natives.js $(LOCAL_PATH)/v8/src/array.js $(LOCAL_PATH)/v8/src/string.js $(LOCAL_PATH)/v8/src/uri.js $(LOCAL_PATH)/v8/src/math.js $(LOCAL_PATH)/v8/src/messages.js $(LOCAL_PATH)/v8/src/apinatives.js $(LOCAL_PATH)/v8/src/debug-debugger.js $(LOCAL_PATH)/v8/src/mirror-debugger.js $(LOCAL_PATH)/v8/src/liveedit-debugger.js $(LOCAL_PATH)/v8/src/date.js $(LOCAL_PATH)/v8/src/json.js $(LOCAL_PATH)/v8/src/regexp.js $(LOCAL_PATH)/v8/src/arraybuffer.js $(LOCAL_PATH)/v8/src/typedarray.js $(LOCAL_PATH)/v8/src/macros.py $(GYP_TARGET_DEPENDENCIES)
@echo "Gyp action: v8_tools_gyp_v8_gyp_js2c_host_js2c ($@)"
- $(hide)cd $(gyp_local_path)/v8/tools/gyp; mkdir -p $(gyp_shared_intermediate_dir); python ../../tools/js2c.py "$(gyp_shared_intermediate_dir)/libraries.cc" CORE off ../../src/runtime.js ../../src/v8natives.js ../../src/array.js ../../src/string.js ../../src/uri.js ../../src/math.js ../../src/messages.js ../../src/apinatives.js ../../src/debug-debugger.js ../../src/mirror-debugger.js ../../src/liveedit-debugger.js ../../src/date.js ../../src/json.js ../../src/regexp.js ../../src/macros.py
+ $(hide)cd $(gyp_local_path)/v8/tools/gyp; mkdir -p $(gyp_shared_intermediate_dir); python ../../tools/js2c.py "$(gyp_shared_intermediate_dir)/libraries.cc" CORE off ../../src/runtime.js ../../src/v8natives.js ../../src/array.js ../../src/string.js ../../src/uri.js ../../src/math.js ../../src/messages.js ../../src/apinatives.js ../../src/debug-debugger.js ../../src/mirror-debugger.js ../../src/liveedit-debugger.js ../../src/date.js ../../src/json.js ../../src/regexp.js ../../src/arraybuffer.js ../../src/typedarray.js ../../src/macros.py
### Rules for action "js2c_experimental":
@@ -29,9 +29,9 @@
$(gyp_shared_intermediate_dir)/experimental-libraries.cc: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir))
$(gyp_shared_intermediate_dir)/experimental-libraries.cc: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
$(gyp_shared_intermediate_dir)/experimental-libraries.cc: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
-$(gyp_shared_intermediate_dir)/experimental-libraries.cc: $(LOCAL_PATH)/v8/tools/js2c.py $(LOCAL_PATH)/v8/src/macros.py $(LOCAL_PATH)/v8/src/symbol.js $(LOCAL_PATH)/v8/src/proxy.js $(LOCAL_PATH)/v8/src/collection.js $(LOCAL_PATH)/v8/src/object-observe.js $(LOCAL_PATH)/v8/src/arraybuffer.js $(LOCAL_PATH)/v8/src/typedarray.js $(LOCAL_PATH)/v8/src/generator.js $(LOCAL_PATH)/v8/src/array-iterator.js $(LOCAL_PATH)/v8/src/harmony-string.js $(LOCAL_PATH)/v8/src/harmony-array.js $(GYP_TARGET_DEPENDENCIES)
+$(gyp_shared_intermediate_dir)/experimental-libraries.cc: $(LOCAL_PATH)/v8/tools/js2c.py $(LOCAL_PATH)/v8/src/macros.py $(LOCAL_PATH)/v8/src/symbol.js $(LOCAL_PATH)/v8/src/proxy.js $(LOCAL_PATH)/v8/src/collection.js $(LOCAL_PATH)/v8/src/object-observe.js $(LOCAL_PATH)/v8/src/generator.js $(LOCAL_PATH)/v8/src/array-iterator.js $(LOCAL_PATH)/v8/src/harmony-string.js $(LOCAL_PATH)/v8/src/harmony-array.js $(GYP_TARGET_DEPENDENCIES)
@echo "Gyp action: v8_tools_gyp_v8_gyp_js2c_host_js2c_experimental ($@)"
- $(hide)cd $(gyp_local_path)/v8/tools/gyp; mkdir -p $(gyp_shared_intermediate_dir); python ../../tools/js2c.py "$(gyp_shared_intermediate_dir)/experimental-libraries.cc" EXPERIMENTAL off ../../src/macros.py ../../src/symbol.js ../../src/proxy.js ../../src/collection.js ../../src/object-observe.js ../../src/arraybuffer.js ../../src/typedarray.js ../../src/generator.js ../../src/array-iterator.js ../../src/harmony-string.js ../../src/harmony-array.js
+ $(hide)cd $(gyp_local_path)/v8/tools/gyp; mkdir -p $(gyp_shared_intermediate_dir); python ../../tools/js2c.py "$(gyp_shared_intermediate_dir)/experimental-libraries.cc" EXPERIMENTAL off ../../src/macros.py ../../src/symbol.js ../../src/proxy.js ../../src/collection.js ../../src/object-observe.js ../../src/generator.js ../../src/array-iterator.js ../../src/harmony-string.js ../../src/harmony-array.js
### Rules for action "js2c_i18n":
diff --git a/tools/gyp/js2c.host.linux-arm.mk b/tools/gyp/js2c.host.linux-arm.mk
index 6d3de6d..ba96fdb 100644
--- a/tools/gyp/js2c.host.linux-arm.mk
+++ b/tools/gyp/js2c.host.linux-arm.mk
@@ -19,9 +19,9 @@
$(gyp_shared_intermediate_dir)/libraries.cc: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir))
$(gyp_shared_intermediate_dir)/libraries.cc: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
$(gyp_shared_intermediate_dir)/libraries.cc: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
-$(gyp_shared_intermediate_dir)/libraries.cc: $(LOCAL_PATH)/v8/tools/js2c.py $(LOCAL_PATH)/v8/src/runtime.js $(LOCAL_PATH)/v8/src/v8natives.js $(LOCAL_PATH)/v8/src/array.js $(LOCAL_PATH)/v8/src/string.js $(LOCAL_PATH)/v8/src/uri.js $(LOCAL_PATH)/v8/src/math.js $(LOCAL_PATH)/v8/src/messages.js $(LOCAL_PATH)/v8/src/apinatives.js $(LOCAL_PATH)/v8/src/debug-debugger.js $(LOCAL_PATH)/v8/src/mirror-debugger.js $(LOCAL_PATH)/v8/src/liveedit-debugger.js $(LOCAL_PATH)/v8/src/date.js $(LOCAL_PATH)/v8/src/json.js $(LOCAL_PATH)/v8/src/regexp.js $(LOCAL_PATH)/v8/src/macros.py $(GYP_TARGET_DEPENDENCIES)
+$(gyp_shared_intermediate_dir)/libraries.cc: $(LOCAL_PATH)/v8/tools/js2c.py $(LOCAL_PATH)/v8/src/runtime.js $(LOCAL_PATH)/v8/src/v8natives.js $(LOCAL_PATH)/v8/src/array.js $(LOCAL_PATH)/v8/src/string.js $(LOCAL_PATH)/v8/src/uri.js $(LOCAL_PATH)/v8/src/math.js $(LOCAL_PATH)/v8/src/messages.js $(LOCAL_PATH)/v8/src/apinatives.js $(LOCAL_PATH)/v8/src/debug-debugger.js $(LOCAL_PATH)/v8/src/mirror-debugger.js $(LOCAL_PATH)/v8/src/liveedit-debugger.js $(LOCAL_PATH)/v8/src/date.js $(LOCAL_PATH)/v8/src/json.js $(LOCAL_PATH)/v8/src/regexp.js $(LOCAL_PATH)/v8/src/arraybuffer.js $(LOCAL_PATH)/v8/src/typedarray.js $(LOCAL_PATH)/v8/src/macros.py $(GYP_TARGET_DEPENDENCIES)
@echo "Gyp action: v8_tools_gyp_v8_gyp_js2c_host_js2c ($@)"
- $(hide)cd $(gyp_local_path)/v8/tools/gyp; mkdir -p $(gyp_shared_intermediate_dir); python ../../tools/js2c.py "$(gyp_shared_intermediate_dir)/libraries.cc" CORE off ../../src/runtime.js ../../src/v8natives.js ../../src/array.js ../../src/string.js ../../src/uri.js ../../src/math.js ../../src/messages.js ../../src/apinatives.js ../../src/debug-debugger.js ../../src/mirror-debugger.js ../../src/liveedit-debugger.js ../../src/date.js ../../src/json.js ../../src/regexp.js ../../src/macros.py
+ $(hide)cd $(gyp_local_path)/v8/tools/gyp; mkdir -p $(gyp_shared_intermediate_dir); python ../../tools/js2c.py "$(gyp_shared_intermediate_dir)/libraries.cc" CORE off ../../src/runtime.js ../../src/v8natives.js ../../src/array.js ../../src/string.js ../../src/uri.js ../../src/math.js ../../src/messages.js ../../src/apinatives.js ../../src/debug-debugger.js ../../src/mirror-debugger.js ../../src/liveedit-debugger.js ../../src/date.js ../../src/json.js ../../src/regexp.js ../../src/arraybuffer.js ../../src/typedarray.js ../../src/macros.py
### Rules for action "js2c_experimental":
@@ -29,9 +29,9 @@
$(gyp_shared_intermediate_dir)/experimental-libraries.cc: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir))
$(gyp_shared_intermediate_dir)/experimental-libraries.cc: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
$(gyp_shared_intermediate_dir)/experimental-libraries.cc: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
-$(gyp_shared_intermediate_dir)/experimental-libraries.cc: $(LOCAL_PATH)/v8/tools/js2c.py $(LOCAL_PATH)/v8/src/macros.py $(LOCAL_PATH)/v8/src/symbol.js $(LOCAL_PATH)/v8/src/proxy.js $(LOCAL_PATH)/v8/src/collection.js $(LOCAL_PATH)/v8/src/object-observe.js $(LOCAL_PATH)/v8/src/arraybuffer.js $(LOCAL_PATH)/v8/src/typedarray.js $(LOCAL_PATH)/v8/src/generator.js $(LOCAL_PATH)/v8/src/array-iterator.js $(LOCAL_PATH)/v8/src/harmony-string.js $(LOCAL_PATH)/v8/src/harmony-array.js $(GYP_TARGET_DEPENDENCIES)
+$(gyp_shared_intermediate_dir)/experimental-libraries.cc: $(LOCAL_PATH)/v8/tools/js2c.py $(LOCAL_PATH)/v8/src/macros.py $(LOCAL_PATH)/v8/src/symbol.js $(LOCAL_PATH)/v8/src/proxy.js $(LOCAL_PATH)/v8/src/collection.js $(LOCAL_PATH)/v8/src/object-observe.js $(LOCAL_PATH)/v8/src/generator.js $(LOCAL_PATH)/v8/src/array-iterator.js $(LOCAL_PATH)/v8/src/harmony-string.js $(LOCAL_PATH)/v8/src/harmony-array.js $(GYP_TARGET_DEPENDENCIES)
@echo "Gyp action: v8_tools_gyp_v8_gyp_js2c_host_js2c_experimental ($@)"
- $(hide)cd $(gyp_local_path)/v8/tools/gyp; mkdir -p $(gyp_shared_intermediate_dir); python ../../tools/js2c.py "$(gyp_shared_intermediate_dir)/experimental-libraries.cc" EXPERIMENTAL off ../../src/macros.py ../../src/symbol.js ../../src/proxy.js ../../src/collection.js ../../src/object-observe.js ../../src/arraybuffer.js ../../src/typedarray.js ../../src/generator.js ../../src/array-iterator.js ../../src/harmony-string.js ../../src/harmony-array.js
+ $(hide)cd $(gyp_local_path)/v8/tools/gyp; mkdir -p $(gyp_shared_intermediate_dir); python ../../tools/js2c.py "$(gyp_shared_intermediate_dir)/experimental-libraries.cc" EXPERIMENTAL off ../../src/macros.py ../../src/symbol.js ../../src/proxy.js ../../src/collection.js ../../src/object-observe.js ../../src/generator.js ../../src/array-iterator.js ../../src/harmony-string.js ../../src/harmony-array.js
### Rules for action "js2c_i18n":
diff --git a/tools/gyp/js2c.host.linux-mips.mk b/tools/gyp/js2c.host.linux-mips.mk
index 6d3de6d..ba96fdb 100644
--- a/tools/gyp/js2c.host.linux-mips.mk
+++ b/tools/gyp/js2c.host.linux-mips.mk
@@ -19,9 +19,9 @@
$(gyp_shared_intermediate_dir)/libraries.cc: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir))
$(gyp_shared_intermediate_dir)/libraries.cc: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
$(gyp_shared_intermediate_dir)/libraries.cc: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
-$(gyp_shared_intermediate_dir)/libraries.cc: $(LOCAL_PATH)/v8/tools/js2c.py $(LOCAL_PATH)/v8/src/runtime.js $(LOCAL_PATH)/v8/src/v8natives.js $(LOCAL_PATH)/v8/src/array.js $(LOCAL_PATH)/v8/src/string.js $(LOCAL_PATH)/v8/src/uri.js $(LOCAL_PATH)/v8/src/math.js $(LOCAL_PATH)/v8/src/messages.js $(LOCAL_PATH)/v8/src/apinatives.js $(LOCAL_PATH)/v8/src/debug-debugger.js $(LOCAL_PATH)/v8/src/mirror-debugger.js $(LOCAL_PATH)/v8/src/liveedit-debugger.js $(LOCAL_PATH)/v8/src/date.js $(LOCAL_PATH)/v8/src/json.js $(LOCAL_PATH)/v8/src/regexp.js $(LOCAL_PATH)/v8/src/macros.py $(GYP_TARGET_DEPENDENCIES)
+$(gyp_shared_intermediate_dir)/libraries.cc: $(LOCAL_PATH)/v8/tools/js2c.py $(LOCAL_PATH)/v8/src/runtime.js $(LOCAL_PATH)/v8/src/v8natives.js $(LOCAL_PATH)/v8/src/array.js $(LOCAL_PATH)/v8/src/string.js $(LOCAL_PATH)/v8/src/uri.js $(LOCAL_PATH)/v8/src/math.js $(LOCAL_PATH)/v8/src/messages.js $(LOCAL_PATH)/v8/src/apinatives.js $(LOCAL_PATH)/v8/src/debug-debugger.js $(LOCAL_PATH)/v8/src/mirror-debugger.js $(LOCAL_PATH)/v8/src/liveedit-debugger.js $(LOCAL_PATH)/v8/src/date.js $(LOCAL_PATH)/v8/src/json.js $(LOCAL_PATH)/v8/src/regexp.js $(LOCAL_PATH)/v8/src/arraybuffer.js $(LOCAL_PATH)/v8/src/typedarray.js $(LOCAL_PATH)/v8/src/macros.py $(GYP_TARGET_DEPENDENCIES)
@echo "Gyp action: v8_tools_gyp_v8_gyp_js2c_host_js2c ($@)"
- $(hide)cd $(gyp_local_path)/v8/tools/gyp; mkdir -p $(gyp_shared_intermediate_dir); python ../../tools/js2c.py "$(gyp_shared_intermediate_dir)/libraries.cc" CORE off ../../src/runtime.js ../../src/v8natives.js ../../src/array.js ../../src/string.js ../../src/uri.js ../../src/math.js ../../src/messages.js ../../src/apinatives.js ../../src/debug-debugger.js ../../src/mirror-debugger.js ../../src/liveedit-debugger.js ../../src/date.js ../../src/json.js ../../src/regexp.js ../../src/macros.py
+ $(hide)cd $(gyp_local_path)/v8/tools/gyp; mkdir -p $(gyp_shared_intermediate_dir); python ../../tools/js2c.py "$(gyp_shared_intermediate_dir)/libraries.cc" CORE off ../../src/runtime.js ../../src/v8natives.js ../../src/array.js ../../src/string.js ../../src/uri.js ../../src/math.js ../../src/messages.js ../../src/apinatives.js ../../src/debug-debugger.js ../../src/mirror-debugger.js ../../src/liveedit-debugger.js ../../src/date.js ../../src/json.js ../../src/regexp.js ../../src/arraybuffer.js ../../src/typedarray.js ../../src/macros.py
### Rules for action "js2c_experimental":
@@ -29,9 +29,9 @@
$(gyp_shared_intermediate_dir)/experimental-libraries.cc: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir))
$(gyp_shared_intermediate_dir)/experimental-libraries.cc: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
$(gyp_shared_intermediate_dir)/experimental-libraries.cc: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
-$(gyp_shared_intermediate_dir)/experimental-libraries.cc: $(LOCAL_PATH)/v8/tools/js2c.py $(LOCAL_PATH)/v8/src/macros.py $(LOCAL_PATH)/v8/src/symbol.js $(LOCAL_PATH)/v8/src/proxy.js $(LOCAL_PATH)/v8/src/collection.js $(LOCAL_PATH)/v8/src/object-observe.js $(LOCAL_PATH)/v8/src/arraybuffer.js $(LOCAL_PATH)/v8/src/typedarray.js $(LOCAL_PATH)/v8/src/generator.js $(LOCAL_PATH)/v8/src/array-iterator.js $(LOCAL_PATH)/v8/src/harmony-string.js $(LOCAL_PATH)/v8/src/harmony-array.js $(GYP_TARGET_DEPENDENCIES)
+$(gyp_shared_intermediate_dir)/experimental-libraries.cc: $(LOCAL_PATH)/v8/tools/js2c.py $(LOCAL_PATH)/v8/src/macros.py $(LOCAL_PATH)/v8/src/symbol.js $(LOCAL_PATH)/v8/src/proxy.js $(LOCAL_PATH)/v8/src/collection.js $(LOCAL_PATH)/v8/src/object-observe.js $(LOCAL_PATH)/v8/src/generator.js $(LOCAL_PATH)/v8/src/array-iterator.js $(LOCAL_PATH)/v8/src/harmony-string.js $(LOCAL_PATH)/v8/src/harmony-array.js $(GYP_TARGET_DEPENDENCIES)
@echo "Gyp action: v8_tools_gyp_v8_gyp_js2c_host_js2c_experimental ($@)"
- $(hide)cd $(gyp_local_path)/v8/tools/gyp; mkdir -p $(gyp_shared_intermediate_dir); python ../../tools/js2c.py "$(gyp_shared_intermediate_dir)/experimental-libraries.cc" EXPERIMENTAL off ../../src/macros.py ../../src/symbol.js ../../src/proxy.js ../../src/collection.js ../../src/object-observe.js ../../src/arraybuffer.js ../../src/typedarray.js ../../src/generator.js ../../src/array-iterator.js ../../src/harmony-string.js ../../src/harmony-array.js
+ $(hide)cd $(gyp_local_path)/v8/tools/gyp; mkdir -p $(gyp_shared_intermediate_dir); python ../../tools/js2c.py "$(gyp_shared_intermediate_dir)/experimental-libraries.cc" EXPERIMENTAL off ../../src/macros.py ../../src/symbol.js ../../src/proxy.js ../../src/collection.js ../../src/object-observe.js ../../src/generator.js ../../src/array-iterator.js ../../src/harmony-string.js ../../src/harmony-array.js
### Rules for action "js2c_i18n":
diff --git a/tools/gyp/js2c.host.linux-x86.mk b/tools/gyp/js2c.host.linux-x86.mk
index 6d3de6d..ba96fdb 100644
--- a/tools/gyp/js2c.host.linux-x86.mk
+++ b/tools/gyp/js2c.host.linux-x86.mk
@@ -19,9 +19,9 @@
$(gyp_shared_intermediate_dir)/libraries.cc: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir))
$(gyp_shared_intermediate_dir)/libraries.cc: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
$(gyp_shared_intermediate_dir)/libraries.cc: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
-$(gyp_shared_intermediate_dir)/libraries.cc: $(LOCAL_PATH)/v8/tools/js2c.py $(LOCAL_PATH)/v8/src/runtime.js $(LOCAL_PATH)/v8/src/v8natives.js $(LOCAL_PATH)/v8/src/array.js $(LOCAL_PATH)/v8/src/string.js $(LOCAL_PATH)/v8/src/uri.js $(LOCAL_PATH)/v8/src/math.js $(LOCAL_PATH)/v8/src/messages.js $(LOCAL_PATH)/v8/src/apinatives.js $(LOCAL_PATH)/v8/src/debug-debugger.js $(LOCAL_PATH)/v8/src/mirror-debugger.js $(LOCAL_PATH)/v8/src/liveedit-debugger.js $(LOCAL_PATH)/v8/src/date.js $(LOCAL_PATH)/v8/src/json.js $(LOCAL_PATH)/v8/src/regexp.js $(LOCAL_PATH)/v8/src/macros.py $(GYP_TARGET_DEPENDENCIES)
+$(gyp_shared_intermediate_dir)/libraries.cc: $(LOCAL_PATH)/v8/tools/js2c.py $(LOCAL_PATH)/v8/src/runtime.js $(LOCAL_PATH)/v8/src/v8natives.js $(LOCAL_PATH)/v8/src/array.js $(LOCAL_PATH)/v8/src/string.js $(LOCAL_PATH)/v8/src/uri.js $(LOCAL_PATH)/v8/src/math.js $(LOCAL_PATH)/v8/src/messages.js $(LOCAL_PATH)/v8/src/apinatives.js $(LOCAL_PATH)/v8/src/debug-debugger.js $(LOCAL_PATH)/v8/src/mirror-debugger.js $(LOCAL_PATH)/v8/src/liveedit-debugger.js $(LOCAL_PATH)/v8/src/date.js $(LOCAL_PATH)/v8/src/json.js $(LOCAL_PATH)/v8/src/regexp.js $(LOCAL_PATH)/v8/src/arraybuffer.js $(LOCAL_PATH)/v8/src/typedarray.js $(LOCAL_PATH)/v8/src/macros.py $(GYP_TARGET_DEPENDENCIES)
@echo "Gyp action: v8_tools_gyp_v8_gyp_js2c_host_js2c ($@)"
- $(hide)cd $(gyp_local_path)/v8/tools/gyp; mkdir -p $(gyp_shared_intermediate_dir); python ../../tools/js2c.py "$(gyp_shared_intermediate_dir)/libraries.cc" CORE off ../../src/runtime.js ../../src/v8natives.js ../../src/array.js ../../src/string.js ../../src/uri.js ../../src/math.js ../../src/messages.js ../../src/apinatives.js ../../src/debug-debugger.js ../../src/mirror-debugger.js ../../src/liveedit-debugger.js ../../src/date.js ../../src/json.js ../../src/regexp.js ../../src/macros.py
+ $(hide)cd $(gyp_local_path)/v8/tools/gyp; mkdir -p $(gyp_shared_intermediate_dir); python ../../tools/js2c.py "$(gyp_shared_intermediate_dir)/libraries.cc" CORE off ../../src/runtime.js ../../src/v8natives.js ../../src/array.js ../../src/string.js ../../src/uri.js ../../src/math.js ../../src/messages.js ../../src/apinatives.js ../../src/debug-debugger.js ../../src/mirror-debugger.js ../../src/liveedit-debugger.js ../../src/date.js ../../src/json.js ../../src/regexp.js ../../src/arraybuffer.js ../../src/typedarray.js ../../src/macros.py
### Rules for action "js2c_experimental":
@@ -29,9 +29,9 @@
$(gyp_shared_intermediate_dir)/experimental-libraries.cc: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir))
$(gyp_shared_intermediate_dir)/experimental-libraries.cc: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
$(gyp_shared_intermediate_dir)/experimental-libraries.cc: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
-$(gyp_shared_intermediate_dir)/experimental-libraries.cc: $(LOCAL_PATH)/v8/tools/js2c.py $(LOCAL_PATH)/v8/src/macros.py $(LOCAL_PATH)/v8/src/symbol.js $(LOCAL_PATH)/v8/src/proxy.js $(LOCAL_PATH)/v8/src/collection.js $(LOCAL_PATH)/v8/src/object-observe.js $(LOCAL_PATH)/v8/src/arraybuffer.js $(LOCAL_PATH)/v8/src/typedarray.js $(LOCAL_PATH)/v8/src/generator.js $(LOCAL_PATH)/v8/src/array-iterator.js $(LOCAL_PATH)/v8/src/harmony-string.js $(LOCAL_PATH)/v8/src/harmony-array.js $(GYP_TARGET_DEPENDENCIES)
+$(gyp_shared_intermediate_dir)/experimental-libraries.cc: $(LOCAL_PATH)/v8/tools/js2c.py $(LOCAL_PATH)/v8/src/macros.py $(LOCAL_PATH)/v8/src/symbol.js $(LOCAL_PATH)/v8/src/proxy.js $(LOCAL_PATH)/v8/src/collection.js $(LOCAL_PATH)/v8/src/object-observe.js $(LOCAL_PATH)/v8/src/generator.js $(LOCAL_PATH)/v8/src/array-iterator.js $(LOCAL_PATH)/v8/src/harmony-string.js $(LOCAL_PATH)/v8/src/harmony-array.js $(GYP_TARGET_DEPENDENCIES)
@echo "Gyp action: v8_tools_gyp_v8_gyp_js2c_host_js2c_experimental ($@)"
- $(hide)cd $(gyp_local_path)/v8/tools/gyp; mkdir -p $(gyp_shared_intermediate_dir); python ../../tools/js2c.py "$(gyp_shared_intermediate_dir)/experimental-libraries.cc" EXPERIMENTAL off ../../src/macros.py ../../src/symbol.js ../../src/proxy.js ../../src/collection.js ../../src/object-observe.js ../../src/arraybuffer.js ../../src/typedarray.js ../../src/generator.js ../../src/array-iterator.js ../../src/harmony-string.js ../../src/harmony-array.js
+ $(hide)cd $(gyp_local_path)/v8/tools/gyp; mkdir -p $(gyp_shared_intermediate_dir); python ../../tools/js2c.py "$(gyp_shared_intermediate_dir)/experimental-libraries.cc" EXPERIMENTAL off ../../src/macros.py ../../src/symbol.js ../../src/proxy.js ../../src/collection.js ../../src/object-observe.js ../../src/generator.js ../../src/array-iterator.js ../../src/harmony-string.js ../../src/harmony-array.js
### Rules for action "js2c_i18n":
diff --git a/tools/gyp/v8_base.arm.host.darwin-arm.mk b/tools/gyp/v8_base.arm.host.darwin-arm.mk
index 088b2a4..71e7280 100644
--- a/tools/gyp/v8_base.arm.host.darwin-arm.mk
+++ b/tools/gyp/v8_base.arm.host.darwin-arm.mk
@@ -97,6 +97,7 @@
v8/src/hydrogen-sce.cc \
v8/src/hydrogen-uint32-analysis.cc \
v8/src/hydrogen-osr.cc \
+ v8/src/i18n.cc \
v8/src/icu_util.cc \
v8/src/ic.cc \
v8/src/incremental-marking.cc \
@@ -181,10 +182,7 @@
v8/src/arm/simulator-arm.cc \
v8/src/arm/stub-cache-arm.cc \
v8/src/platform-posix.cc \
- v8/src/i18n.cc \
- v8/src/extensions/i18n/break-iterator.cc \
v8/src/extensions/i18n/i18n-extension.cc \
- v8/src/extensions/i18n/i18n-utils.cc \
v8/src/platform-macos.cc
@@ -230,6 +228,9 @@
'-DU_STATIC_IMPLEMENTATION' \
'-DARM_TEST' \
'-DCAN_USE_ARMV7_INSTRUCTIONS=1' \
+ '-DV8_OS_BSD=1' \
+ '-DV8_OS_MACOSX=1' \
+ '-DV8_OS_POSIX=1' \
'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
'-D_DEBUG' \
@@ -299,6 +300,9 @@
'-DU_STATIC_IMPLEMENTATION' \
'-DARM_TEST' \
'-DCAN_USE_ARMV7_INSTRUCTIONS=1' \
+ '-DV8_OS_BSD=1' \
+ '-DV8_OS_MACOSX=1' \
+ '-DV8_OS_POSIX=1' \
'-DNDEBUG' \
'-DNVALGRIND' \
'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
diff --git a/tools/gyp/v8_base.arm.host.linux-arm.mk b/tools/gyp/v8_base.arm.host.linux-arm.mk
index fbf4910..78929f1 100644
--- a/tools/gyp/v8_base.arm.host.linux-arm.mk
+++ b/tools/gyp/v8_base.arm.host.linux-arm.mk
@@ -97,6 +97,7 @@
v8/src/hydrogen-sce.cc \
v8/src/hydrogen-uint32-analysis.cc \
v8/src/hydrogen-osr.cc \
+ v8/src/i18n.cc \
v8/src/icu_util.cc \
v8/src/ic.cc \
v8/src/incremental-marking.cc \
@@ -182,10 +183,7 @@
v8/src/arm/stub-cache-arm.cc \
v8/src/platform-posix.cc \
v8/src/platform-linux.cc \
- v8/src/i18n.cc \
- v8/src/extensions/i18n/break-iterator.cc \
- v8/src/extensions/i18n/i18n-extension.cc \
- v8/src/extensions/i18n/i18n-utils.cc
+ v8/src/extensions/i18n/i18n-extension.cc
# Flags passed to both C and C++ files.
@@ -226,6 +224,8 @@
'-DENABLE_DEBUGGER_SUPPORT' \
'-DV8_I18N_SUPPORT' \
'-DCAN_USE_VFP_INSTRUCTIONS' \
+ '-DV8_OS_LINUX=1' \
+ '-DV8_OS_POSIX=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_STATIC_IMPLEMENTATION' \
'-DARM_TEST' \
@@ -295,6 +295,8 @@
'-DENABLE_DEBUGGER_SUPPORT' \
'-DV8_I18N_SUPPORT' \
'-DCAN_USE_VFP_INSTRUCTIONS' \
+ '-DV8_OS_LINUX=1' \
+ '-DV8_OS_POSIX=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_STATIC_IMPLEMENTATION' \
'-DARM_TEST' \
diff --git a/tools/gyp/v8_base.arm.target.darwin-arm.mk b/tools/gyp/v8_base.arm.target.darwin-arm.mk
index 41f94f7..0c9246d 100644
--- a/tools/gyp/v8_base.arm.target.darwin-arm.mk
+++ b/tools/gyp/v8_base.arm.target.darwin-arm.mk
@@ -98,6 +98,7 @@
v8/src/hydrogen-sce.cc \
v8/src/hydrogen-uint32-analysis.cc \
v8/src/hydrogen-osr.cc \
+ v8/src/i18n.cc \
v8/src/icu_util.cc \
v8/src/ic.cc \
v8/src/incremental-marking.cc \
@@ -182,10 +183,7 @@
v8/src/arm/simulator-arm.cc \
v8/src/arm/stub-cache-arm.cc \
v8/src/platform-posix.cc \
- v8/src/i18n.cc \
- v8/src/extensions/i18n/break-iterator.cc \
v8/src/extensions/i18n/i18n-extension.cc \
- v8/src/extensions/i18n/i18n-utils.cc \
v8/src/platform-linux.cc
@@ -251,6 +249,8 @@
'-DCHROME_BUILD_ID=""' \
'-DARM_TEST' \
'-DCAN_USE_ARMV7_INSTRUCTIONS=1' \
+ '-DV8_OS_LINUX=1' \
+ '-DV8_OS_POSIX=1' \
'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
'-D_DEBUG' \
@@ -350,6 +350,8 @@
'-DCHROME_BUILD_ID=""' \
'-DARM_TEST' \
'-DCAN_USE_ARMV7_INSTRUCTIONS=1' \
+ '-DV8_OS_LINUX=1' \
+ '-DV8_OS_POSIX=1' \
'-DNDEBUG' \
'-DNVALGRIND' \
'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
diff --git a/tools/gyp/v8_base.arm.target.linux-arm.mk b/tools/gyp/v8_base.arm.target.linux-arm.mk
index 1bd2846..7a66a00 100644
--- a/tools/gyp/v8_base.arm.target.linux-arm.mk
+++ b/tools/gyp/v8_base.arm.target.linux-arm.mk
@@ -98,6 +98,7 @@
v8/src/hydrogen-sce.cc \
v8/src/hydrogen-uint32-analysis.cc \
v8/src/hydrogen-osr.cc \
+ v8/src/i18n.cc \
v8/src/icu_util.cc \
v8/src/ic.cc \
v8/src/incremental-marking.cc \
@@ -183,10 +184,7 @@
v8/src/arm/stub-cache-arm.cc \
v8/src/platform-posix.cc \
v8/src/platform-linux.cc \
- v8/src/i18n.cc \
- v8/src/extensions/i18n/break-iterator.cc \
- v8/src/extensions/i18n/i18n-extension.cc \
- v8/src/extensions/i18n/i18n-utils.cc
+ v8/src/extensions/i18n/i18n-extension.cc
# Flags passed to both C and C++ files.
@@ -243,6 +241,8 @@
'-DENABLE_DEBUGGER_SUPPORT' \
'-DV8_I18N_SUPPORT' \
'-DCAN_USE_VFP_INSTRUCTIONS' \
+ '-DV8_OS_LINUX=1' \
+ '-DV8_OS_POSIX=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DANDROID' \
'-D__GNU_SOURCE=1' \
@@ -342,6 +342,8 @@
'-DENABLE_DEBUGGER_SUPPORT' \
'-DV8_I18N_SUPPORT' \
'-DCAN_USE_VFP_INSTRUCTIONS' \
+ '-DV8_OS_LINUX=1' \
+ '-DV8_OS_POSIX=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DANDROID' \
'-D__GNU_SOURCE=1' \
diff --git a/tools/gyp/v8_base.ia32.host.darwin-x86.mk b/tools/gyp/v8_base.ia32.host.darwin-x86.mk
index cc963b6..9005a4d 100644
--- a/tools/gyp/v8_base.ia32.host.darwin-x86.mk
+++ b/tools/gyp/v8_base.ia32.host.darwin-x86.mk
@@ -97,6 +97,7 @@
v8/src/hydrogen-sce.cc \
v8/src/hydrogen-uint32-analysis.cc \
v8/src/hydrogen-osr.cc \
+ v8/src/i18n.cc \
v8/src/icu_util.cc \
v8/src/ic.cc \
v8/src/incremental-marking.cc \
@@ -179,10 +180,7 @@
v8/src/ia32/regexp-macro-assembler-ia32.cc \
v8/src/ia32/stub-cache-ia32.cc \
v8/src/platform-posix.cc \
- v8/src/i18n.cc \
- v8/src/extensions/i18n/break-iterator.cc \
v8/src/extensions/i18n/i18n-extension.cc \
- v8/src/extensions/i18n/i18n-utils.cc \
v8/src/platform-macos.cc
@@ -226,6 +224,9 @@
'-DCAN_USE_VFP_INSTRUCTIONS' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_STATIC_IMPLEMENTATION' \
+ '-DV8_OS_BSD=1' \
+ '-DV8_OS_MACOSX=1' \
+ '-DV8_OS_POSIX=1' \
'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
'-D_DEBUG' \
@@ -295,6 +296,9 @@
'-DCAN_USE_VFP_INSTRUCTIONS' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_STATIC_IMPLEMENTATION' \
+ '-DV8_OS_BSD=1' \
+ '-DV8_OS_MACOSX=1' \
+ '-DV8_OS_POSIX=1' \
'-DNDEBUG' \
'-DNVALGRIND' \
'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
diff --git a/tools/gyp/v8_base.ia32.host.linux-x86.mk b/tools/gyp/v8_base.ia32.host.linux-x86.mk
index a13f2a6..f46360c 100644
--- a/tools/gyp/v8_base.ia32.host.linux-x86.mk
+++ b/tools/gyp/v8_base.ia32.host.linux-x86.mk
@@ -97,6 +97,7 @@
v8/src/hydrogen-sce.cc \
v8/src/hydrogen-uint32-analysis.cc \
v8/src/hydrogen-osr.cc \
+ v8/src/i18n.cc \
v8/src/icu_util.cc \
v8/src/ic.cc \
v8/src/incremental-marking.cc \
@@ -180,10 +181,7 @@
v8/src/ia32/stub-cache-ia32.cc \
v8/src/platform-posix.cc \
v8/src/platform-linux.cc \
- v8/src/i18n.cc \
- v8/src/extensions/i18n/break-iterator.cc \
- v8/src/extensions/i18n/i18n-extension.cc \
- v8/src/extensions/i18n/i18n-utils.cc
+ v8/src/extensions/i18n/i18n-extension.cc
# Flags passed to both C and C++ files.
@@ -224,6 +222,8 @@
'-DENABLE_DEBUGGER_SUPPORT' \
'-DV8_I18N_SUPPORT' \
'-DCAN_USE_VFP_INSTRUCTIONS' \
+ '-DV8_OS_LINUX=1' \
+ '-DV8_OS_POSIX=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_STATIC_IMPLEMENTATION' \
'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
@@ -293,6 +293,8 @@
'-DENABLE_DEBUGGER_SUPPORT' \
'-DV8_I18N_SUPPORT' \
'-DCAN_USE_VFP_INSTRUCTIONS' \
+ '-DV8_OS_LINUX=1' \
+ '-DV8_OS_POSIX=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_STATIC_IMPLEMENTATION' \
'-DNDEBUG' \
diff --git a/tools/gyp/v8_base.ia32.target.darwin-x86.mk b/tools/gyp/v8_base.ia32.target.darwin-x86.mk
index b1292d0..7465165 100644
--- a/tools/gyp/v8_base.ia32.target.darwin-x86.mk
+++ b/tools/gyp/v8_base.ia32.target.darwin-x86.mk
@@ -98,6 +98,7 @@
v8/src/hydrogen-sce.cc \
v8/src/hydrogen-uint32-analysis.cc \
v8/src/hydrogen-osr.cc \
+ v8/src/i18n.cc \
v8/src/icu_util.cc \
v8/src/ic.cc \
v8/src/incremental-marking.cc \
@@ -180,10 +181,7 @@
v8/src/ia32/regexp-macro-assembler-ia32.cc \
v8/src/ia32/stub-cache-ia32.cc \
v8/src/platform-posix.cc \
- v8/src/i18n.cc \
- v8/src/extensions/i18n/break-iterator.cc \
v8/src/extensions/i18n/i18n-extension.cc \
- v8/src/extensions/i18n/i18n-utils.cc \
v8/src/platform-linux.cc
@@ -249,6 +247,8 @@
'-DUSE_STLPORT=1' \
'-D_STLP_USE_PTR_SPECIALIZATIONS=1' \
'-DCHROME_BUILD_ID=""' \
+ '-DV8_OS_LINUX=1' \
+ '-DV8_OS_POSIX=1' \
'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
'-D_DEBUG' \
@@ -349,6 +349,8 @@
'-DUSE_STLPORT=1' \
'-D_STLP_USE_PTR_SPECIALIZATIONS=1' \
'-DCHROME_BUILD_ID=""' \
+ '-DV8_OS_LINUX=1' \
+ '-DV8_OS_POSIX=1' \
'-DNDEBUG' \
'-DNVALGRIND' \
'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
diff --git a/tools/gyp/v8_base.ia32.target.linux-x86.mk b/tools/gyp/v8_base.ia32.target.linux-x86.mk
index e5631a8..6dfcfd7 100644
--- a/tools/gyp/v8_base.ia32.target.linux-x86.mk
+++ b/tools/gyp/v8_base.ia32.target.linux-x86.mk
@@ -98,6 +98,7 @@
v8/src/hydrogen-sce.cc \
v8/src/hydrogen-uint32-analysis.cc \
v8/src/hydrogen-osr.cc \
+ v8/src/i18n.cc \
v8/src/icu_util.cc \
v8/src/ic.cc \
v8/src/incremental-marking.cc \
@@ -181,10 +182,7 @@
v8/src/ia32/stub-cache-ia32.cc \
v8/src/platform-posix.cc \
v8/src/platform-linux.cc \
- v8/src/i18n.cc \
- v8/src/extensions/i18n/break-iterator.cc \
- v8/src/extensions/i18n/i18n-extension.cc \
- v8/src/extensions/i18n/i18n-utils.cc
+ v8/src/extensions/i18n/i18n-extension.cc
# Flags passed to both C and C++ files.
@@ -243,6 +241,8 @@
'-DENABLE_DEBUGGER_SUPPORT' \
'-DV8_I18N_SUPPORT' \
'-DCAN_USE_VFP_INSTRUCTIONS' \
+ '-DV8_OS_LINUX=1' \
+ '-DV8_OS_POSIX=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DANDROID' \
'-D__GNU_SOURCE=1' \
@@ -343,6 +343,8 @@
'-DENABLE_DEBUGGER_SUPPORT' \
'-DV8_I18N_SUPPORT' \
'-DCAN_USE_VFP_INSTRUCTIONS' \
+ '-DV8_OS_LINUX=1' \
+ '-DV8_OS_POSIX=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DANDROID' \
'-D__GNU_SOURCE=1' \
diff --git a/tools/gyp/v8_base.mipsel.host.darwin-mips.mk b/tools/gyp/v8_base.mipsel.host.darwin-mips.mk
index 6147582..6ebc6b5 100644
--- a/tools/gyp/v8_base.mipsel.host.darwin-mips.mk
+++ b/tools/gyp/v8_base.mipsel.host.darwin-mips.mk
@@ -97,6 +97,7 @@
v8/src/hydrogen-sce.cc \
v8/src/hydrogen-uint32-analysis.cc \
v8/src/hydrogen-osr.cc \
+ v8/src/i18n.cc \
v8/src/icu_util.cc \
v8/src/ic.cc \
v8/src/incremental-marking.cc \
@@ -181,10 +182,7 @@
v8/src/mips/simulator-mips.cc \
v8/src/mips/stub-cache-mips.cc \
v8/src/platform-posix.cc \
- v8/src/i18n.cc \
- v8/src/extensions/i18n/break-iterator.cc \
v8/src/extensions/i18n/i18n-extension.cc \
- v8/src/extensions/i18n/i18n-utils.cc \
v8/src/platform-macos.cc
@@ -232,6 +230,9 @@
'-DCAN_USE_VFP_INSTRUCTIONS' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_STATIC_IMPLEMENTATION' \
+ '-DV8_OS_BSD=1' \
+ '-DV8_OS_MACOSX=1' \
+ '-DV8_OS_POSIX=1' \
'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
'-D_DEBUG' \
@@ -303,6 +304,9 @@
'-DCAN_USE_VFP_INSTRUCTIONS' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_STATIC_IMPLEMENTATION' \
+ '-DV8_OS_BSD=1' \
+ '-DV8_OS_MACOSX=1' \
+ '-DV8_OS_POSIX=1' \
'-DNDEBUG' \
'-DNVALGRIND' \
'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
diff --git a/tools/gyp/v8_base.mipsel.host.linux-mips.mk b/tools/gyp/v8_base.mipsel.host.linux-mips.mk
index 368b052..7217f0c 100644
--- a/tools/gyp/v8_base.mipsel.host.linux-mips.mk
+++ b/tools/gyp/v8_base.mipsel.host.linux-mips.mk
@@ -97,6 +97,7 @@
v8/src/hydrogen-sce.cc \
v8/src/hydrogen-uint32-analysis.cc \
v8/src/hydrogen-osr.cc \
+ v8/src/i18n.cc \
v8/src/icu_util.cc \
v8/src/ic.cc \
v8/src/incremental-marking.cc \
@@ -182,10 +183,7 @@
v8/src/mips/stub-cache-mips.cc \
v8/src/platform-posix.cc \
v8/src/platform-linux.cc \
- v8/src/i18n.cc \
- v8/src/extensions/i18n/break-iterator.cc \
- v8/src/extensions/i18n/i18n-extension.cc \
- v8/src/extensions/i18n/i18n-utils.cc
+ v8/src/extensions/i18n/i18n-extension.cc
# Flags passed to both C and C++ files.
@@ -230,6 +228,8 @@
'-DENABLE_DEBUGGER_SUPPORT' \
'-DV8_I18N_SUPPORT' \
'-DCAN_USE_VFP_INSTRUCTIONS' \
+ '-DV8_OS_LINUX=1' \
+ '-DV8_OS_POSIX=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_STATIC_IMPLEMENTATION' \
'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
@@ -301,6 +301,8 @@
'-DENABLE_DEBUGGER_SUPPORT' \
'-DV8_I18N_SUPPORT' \
'-DCAN_USE_VFP_INSTRUCTIONS' \
+ '-DV8_OS_LINUX=1' \
+ '-DV8_OS_POSIX=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DU_STATIC_IMPLEMENTATION' \
'-DNDEBUG' \
diff --git a/tools/gyp/v8_base.mipsel.target.darwin-mips.mk b/tools/gyp/v8_base.mipsel.target.darwin-mips.mk
index f44f81b..96c36f2 100644
--- a/tools/gyp/v8_base.mipsel.target.darwin-mips.mk
+++ b/tools/gyp/v8_base.mipsel.target.darwin-mips.mk
@@ -98,6 +98,7 @@
v8/src/hydrogen-sce.cc \
v8/src/hydrogen-uint32-analysis.cc \
v8/src/hydrogen-osr.cc \
+ v8/src/i18n.cc \
v8/src/icu_util.cc \
v8/src/ic.cc \
v8/src/incremental-marking.cc \
@@ -182,10 +183,7 @@
v8/src/mips/simulator-mips.cc \
v8/src/mips/stub-cache-mips.cc \
v8/src/platform-posix.cc \
- v8/src/i18n.cc \
- v8/src/extensions/i18n/break-iterator.cc \
v8/src/extensions/i18n/i18n-extension.cc \
- v8/src/extensions/i18n/i18n-utils.cc \
v8/src/platform-linux.cc
@@ -252,6 +250,8 @@
'-DUSE_STLPORT=1' \
'-D_STLP_USE_PTR_SPECIALIZATIONS=1' \
'-DCHROME_BUILD_ID=""' \
+ '-DV8_OS_LINUX=1' \
+ '-DV8_OS_POSIX=1' \
'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
'-D_DEBUG' \
@@ -352,6 +352,8 @@
'-DUSE_STLPORT=1' \
'-D_STLP_USE_PTR_SPECIALIZATIONS=1' \
'-DCHROME_BUILD_ID=""' \
+ '-DV8_OS_LINUX=1' \
+ '-DV8_OS_POSIX=1' \
'-DNDEBUG' \
'-DNVALGRIND' \
'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
diff --git a/tools/gyp/v8_base.mipsel.target.linux-mips.mk b/tools/gyp/v8_base.mipsel.target.linux-mips.mk
index 52736f0..1e25c57 100644
--- a/tools/gyp/v8_base.mipsel.target.linux-mips.mk
+++ b/tools/gyp/v8_base.mipsel.target.linux-mips.mk
@@ -98,6 +98,7 @@
v8/src/hydrogen-sce.cc \
v8/src/hydrogen-uint32-analysis.cc \
v8/src/hydrogen-osr.cc \
+ v8/src/i18n.cc \
v8/src/icu_util.cc \
v8/src/ic.cc \
v8/src/incremental-marking.cc \
@@ -183,10 +184,7 @@
v8/src/mips/stub-cache-mips.cc \
v8/src/platform-posix.cc \
v8/src/platform-linux.cc \
- v8/src/i18n.cc \
- v8/src/extensions/i18n/break-iterator.cc \
- v8/src/extensions/i18n/i18n-extension.cc \
- v8/src/extensions/i18n/i18n-utils.cc
+ v8/src/extensions/i18n/i18n-extension.cc
# Flags passed to both C and C++ files.
@@ -246,6 +244,8 @@
'-DENABLE_DEBUGGER_SUPPORT' \
'-DV8_I18N_SUPPORT' \
'-DCAN_USE_VFP_INSTRUCTIONS' \
+ '-DV8_OS_LINUX=1' \
+ '-DV8_OS_POSIX=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DANDROID' \
'-D__GNU_SOURCE=1' \
@@ -346,6 +346,8 @@
'-DENABLE_DEBUGGER_SUPPORT' \
'-DV8_I18N_SUPPORT' \
'-DCAN_USE_VFP_INSTRUCTIONS' \
+ '-DV8_OS_LINUX=1' \
+ '-DV8_OS_POSIX=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DANDROID' \
'-D__GNU_SOURCE=1' \
