Merge V8 at branches/3.2 r8200: Remove generation of experimental-libraries.cc
This is because branches/3.2 r8200 does not contain
http://code.google.com/p/v8/source/detail?r=7630
Note that this is a partial revert of
https://android-git.corp.google.com/g/#change,114511
Change-Id: I121d70cf6453056b15ecbad20346b36a6e0f8850
diff --git a/Android.libv8.mk b/Android.libv8.mk
index 7f7cb22..27de47c 100644
--- a/Android.libv8.mk
+++ b/Android.libv8.mk
@@ -26,7 +26,6 @@
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
@@ -36,7 +35,7 @@
$(copy-file-to-target)
# Generate libraries.cc
-GEN1 := $(intermediates)/libraries.cc
+GEN1 := $(intermediates)/libraries.cc $(intermediates)/libraries-empty.cc
$(GEN1): SCRIPT := $(intermediates)/js2c.py
$(GEN1): $(LOCAL_JS_LIBRARY_FILES) $(JS2C_PY)
@echo "Generating libraries.cc"
@@ -44,14 +43,6 @@
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 28e9c7b..45be0c1 100644
--- a/Android.mksnapshot.mk
+++ b/Android.mksnapshot.mk
@@ -33,7 +33,6 @@
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
@@ -43,23 +42,14 @@
$(copy-file-to-target)
# Generate libraries.cc
-GEN3 := $(intermediates)/libraries.cc
-$(GEN3): SCRIPT := $(intermediates)/js2c.py
-$(GEN3): $(LOCAL_JS_LIBRARY_FILES) $(JS2C_PY)
+GEN2 := $(intermediates)/libraries.cc $(intermediates)/libraries-empty.cc
+$(GEN2): SCRIPT := $(intermediates)/js2c.py
+$(GEN2): $(LOCAL_JS_LIBRARY_FILES) $(JS2C_PY)
@echo "Generating libraries.cc"
@mkdir -p $(dir $@)
- python $(SCRIPT) $(GEN3) CORE $(LOCAL_JS_LIBRARY_FILES)
+ python $(SCRIPT) $(GEN2) 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 \
