Merge V8 at r7668: Update makefiles.
http://code.google.com/p/v8/source/detail?r=7648
Change-Id: Iead441c4d4ace57fc32c4164ea6e4abadbee0338
diff --git a/Android.libv8.mk b/Android.libv8.mk
index dab66d5..3eb42e2 100644
--- a/Android.libv8.mk
+++ b/Android.libv8.mk
@@ -26,6 +26,7 @@
LOCAL_SRC_FILES := $(V8_LOCAL_SRC_FILES)
LOCAL_JS_LIBRARY_FILES := $(addprefix $(LOCAL_PATH)/, $(V8_LOCAL_JS_LIBRARY_FILES))
+LOCAL_JS_EXPERIMENTAL_LIBRARY_FILES := $(addprefix $(LOCAL_PATH)/, src/proxy.js)
# Copy js2c.py to intermediates directory and invoke there to avoid generating
# jsmin.pyc in the source directory
@@ -35,7 +36,7 @@
$(copy-file-to-target)
# Generate libraries.cc
-GEN1 := $(intermediates)/libraries.cc $(intermediates)/libraries-empty.cc
+GEN1 := $(intermediates)/libraries.cc
$(GEN1): SCRIPT := $(intermediates)/js2c.py
$(GEN1): $(LOCAL_JS_LIBRARY_FILES) $(JS2C_PY)
@echo "Generating libraries.cc"
@@ -43,6 +44,14 @@
python $(SCRIPT) $(GEN1) CORE $(LOCAL_JS_LIBRARY_FILES)
V8_GENERATED_LIBRARIES := $(intermediates)/libraries.cc
+GEN2 := $(intermediates)/experimental-libraries.cc
+$(GEN2): SCRIPT := $(intermediates)/js2c.py
+$(GEN2): $(LOCAL_JS_LIBRARY_FILES) $(JS2C_PY)
+ @echo "Generating experimental-libraries.cc"
+ @mkdir -p $(dir $@)
+ python $(SCRIPT) $(GEN2) EXPERIMENTAL $(LOCAL_JS_EXPERIMENTAL_LIBRARY_FILES)
+V8_GENERATED_LIBRARIES += $(intermediates)/experimental-libraries.cc
+
LOCAL_GENERATED_SOURCES += $(V8_GENERATED_LIBRARIES)
# Generate snapshot.cc
diff --git a/Android.mksnapshot.mk b/Android.mksnapshot.mk
index 45be0c1..28e9c7b 100644
--- a/Android.mksnapshot.mk
+++ b/Android.mksnapshot.mk
@@ -33,6 +33,7 @@
LOCAL_SRC_FILES := $(V8_LOCAL_SRC_FILES)
LOCAL_JS_LIBRARY_FILES := $(addprefix $(LOCAL_PATH)/, $(V8_LOCAL_JS_LIBRARY_FILES))
+LOCAL_JS_EXPERIMENTAL_LIBRARY_FILES := $(addprefix $(LOCAL_PATH)/, src/proxy.js)
# Copy js2c.py to intermediates directory and invoke there to avoid generating
# jsmin.pyc in the source directory
@@ -42,14 +43,23 @@
$(copy-file-to-target)
# Generate libraries.cc
-GEN2 := $(intermediates)/libraries.cc $(intermediates)/libraries-empty.cc
-$(GEN2): SCRIPT := $(intermediates)/js2c.py
-$(GEN2): $(LOCAL_JS_LIBRARY_FILES) $(JS2C_PY)
+GEN3 := $(intermediates)/libraries.cc
+$(GEN3): SCRIPT := $(intermediates)/js2c.py
+$(GEN3): $(LOCAL_JS_LIBRARY_FILES) $(JS2C_PY)
@echo "Generating libraries.cc"
@mkdir -p $(dir $@)
- python $(SCRIPT) $(GEN2) CORE $(LOCAL_JS_LIBRARY_FILES)
+ python $(SCRIPT) $(GEN3) CORE $(LOCAL_JS_LIBRARY_FILES)
LOCAL_GENERATED_SOURCES := $(intermediates)/libraries.cc
+# Generate libraries.cc
+GEN4 := $(intermediates)/experimental-libraries.cc
+$(GEN4): SCRIPT := $(intermediates)/js2c.py
+$(GEN4): $(LOCAL_JS_LIBRARY_FILES) $(JS2C_PY)
+ @echo "Generating experimental-libraries.cc"
+ @mkdir -p $(dir $@)
+ python $(SCRIPT) $(GEN4) EXPERIMENTAL $(LOCAL_JS_EXPERIMENTAL_LIBRARY_FILES)
+LOCAL_GENERATED_SOURCES += $(intermediates)/experimental-libraries.cc
+
LOCAL_CFLAGS := \
-Wno-endif-labels \
-Wno-import \
diff --git a/Android.v8common.mk b/Android.v8common.mk
index 68a531c..4a35d36 100644
--- a/Android.v8common.mk
+++ b/Android.v8common.mk
@@ -50,8 +50,6 @@
src/interpreter-irregexp.cc \
src/isolate.cc \
src/jsregexp.cc \
- src/jump-target.cc \
- src/jump-target-light.cc \
src/lithium.cc \
src/lithium-allocator.cc \
src/liveedit.cc \
@@ -68,7 +66,6 @@
src/regexp-macro-assembler.cc \
src/regexp-macro-assembler-irregexp.cc \
src/regexp-stack.cc \
- src/register-allocator.cc \
src/rewriter.cc \
src/runtime.cc \
src/runtime-profiler.cc \
@@ -93,8 +90,6 @@
src/v8.cc \
src/v8threads.cc \
src/variables.cc \
- src/virtual-frame.cc \
- src/virtual-frame-light.cc \
src/version.cc \
src/zone.cc
@@ -112,15 +107,12 @@
src/arm/frames-arm.cc \
src/arm/full-codegen-arm.cc \
src/arm/ic-arm.cc \
- src/arm/jump-target-arm.cc \
src/arm/lithium-arm.cc \
src/arm/lithium-codegen-arm.cc \
src/arm/lithium-gap-resolver-arm.cc \
src/arm/macro-assembler-arm.cc \
src/arm/regexp-macro-assembler-arm.cc \
- src/arm/register-allocator-arm.cc \
- src/arm/stub-cache-arm.cc \
- src/arm/virtual-frame-arm.cc
+ src/arm/stub-cache-arm.cc
endif
# Enable DEBUG option.