diff options
| author | Ben Murdoch <benm@google.com> | 2011-11-30 15:57:28 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-12-02 17:27:08 +0000 |
| commit | 257744e915dfc84d6d07a6b2accf8402d9ffc708 (patch) | |
| tree | 19d8782d5686697f36b1771e7fcd46f290b82c3c /Android.libv8.mk | |
| parent | 92022043ea907575278de828a5c9cf6939b51e5e (diff) | |
| download | android_external_v8-257744e915dfc84d6d07a6b2accf8402d9ffc708.tar.gz android_external_v8-257744e915dfc84d6d07a6b2accf8402d9ffc708.tar.bz2 android_external_v8-257744e915dfc84d6d07a6b2accf8402d9ffc708.zip | |
Upgrade to V8 3.3
Merge V8 at 3.3.10.39
Simple merge required updates to makefiles only.
Bug: 5688872
Change-Id: I14703f418235f5ce6013b9b3e2e502407a9f6dfd
Diffstat (limited to 'Android.libv8.mk')
| -rw-r--r-- | Android.libv8.mk | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/Android.libv8.mk b/Android.libv8.mk index a7abe3c5..067fb39a 100644 --- a/Android.libv8.mk +++ b/Android.libv8.mk @@ -26,6 +26,7 @@ V8_LOCAL_SRC_FILES += \ 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 @@ $(JS2C_PY): $(intermediates)/%.py : $(LOCAL_PATH)/tools/%.py | $(ACP) $(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,15 @@ $(GEN1): $(LOCAL_JS_LIBRARY_FILES) $(JS2C_PY) python $(SCRIPT) $(GEN1) CORE $(LOCAL_JS_LIBRARY_FILES) V8_GENERATED_LIBRARIES := $(intermediates)/libraries.cc +# Generate experimental-libraries.cc +GEN2 := $(intermediates)/experimental-libraries.cc +$(GEN2): SCRIPT := $(intermediates)/js2c.py +$(GEN2): $(LOCAL_JS_EXPERIMENTAL_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 |