summaryrefslogtreecommitdiffstats
path: root/Android.mksnapshot.mk
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2011-11-30 16:03:39 +0000
committerBen Murdoch <benm@google.com>2011-12-02 17:28:02 +0000
commit69a99ed0b2b2ef69d393c371b03db3a98aaf880e (patch)
tree6438154d0f3ab526b9206f8860fa4db5cf073c11 /Android.mksnapshot.mk
parent3fb3ca8c7ca439d408449a395897395c0faae8d1 (diff)
downloadandroid_external_v8-69a99ed0b2b2ef69d393c371b03db3a98aaf880e.tar.gz
android_external_v8-69a99ed0b2b2ef69d393c371b03db3a98aaf880e.tar.bz2
android_external_v8-69a99ed0b2b2ef69d393c371b03db3a98aaf880e.zip
Upgrade to V8 3.5
Merge V8 3.5.10.24 Simple merge required updates to makefiles only. Bug: 5688872 Change-Id: I0acdb9a1a53919d84e9a7525308e8371739d2f06
Diffstat (limited to 'Android.mksnapshot.mk')
-rw-r--r--Android.mksnapshot.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/Android.mksnapshot.mk b/Android.mksnapshot.mk
index 8f54be70..07da14b0 100644
--- a/Android.mksnapshot.mk
+++ b/Android.mksnapshot.mk
@@ -12,6 +12,7 @@ intermediates := $(call local-intermediates-dir)
V8_LOCAL_SRC_FILES :=
V8_LOCAL_JS_LIBRARY_FILES :=
+V8_LOCAL_JS_EXPERIMENTAL_LIBRARY_FILES :=
include $(LOCAL_PATH)/Android.v8common.mk
V8_LOCAL_SRC_FILES += \
@@ -33,7 +34,7 @@ endif
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)
+LOCAL_JS_EXPERIMENTAL_LIBRARY_FILES := $(addprefix $(LOCAL_PATH)/, $(V8_LOCAL_EXPERIMENTAL_JS_LIBRARY_FILES))
# Copy js2c.py to intermediates directory and invoke there to avoid generating
# jsmin.pyc in the source directory