diff options
| author | Ben Murdoch <benm@google.com> | 2011-06-02 12:56:56 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-10 15:08:40 +0100 |
| commit | 46baaaf9a62c63bd863945d1758db3121ac8986f (patch) | |
| tree | 69c786b243e9e3d2f208c3edd6540553c6b99a63 /Android.mksnapshot.mk | |
| parent | 8b112d2025046f85ef7f6be087c6129c872ebad2 (diff) | |
| download | android_external_v8-46baaaf9a62c63bd863945d1758db3121ac8986f.tar.gz android_external_v8-46baaaf9a62c63bd863945d1758db3121ac8986f.tar.bz2 android_external_v8-46baaaf9a62c63bd863945d1758db3121ac8986f.zip | |
Merge V8 at r7668: Update makefiles.
http://code.google.com/p/v8/source/detail?r=7648
Change-Id: Iead441c4d4ace57fc32c4164ea6e4abadbee0338
Diffstat (limited to 'Android.mksnapshot.mk')
| -rw-r--r-- | Android.mksnapshot.mk | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/Android.mksnapshot.mk b/Android.mksnapshot.mk index 45be0c11..28e9c7bd 100644 --- a/Android.mksnapshot.mk +++ b/Android.mksnapshot.mk @@ -33,6 +33,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) # Copy js2c.py to intermediates directory and invoke there to avoid generating # jsmin.pyc in the source directory @@ -42,14 +43,23 @@ $(JS2C_PY): $(intermediates)/%.py : $(LOCAL_PATH)/tools/%.py | $(ACP) $(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 \ |