diff options
| author | Steve Block <steveblock@google.com> | 2011-06-13 19:35:19 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-06-13 19:53:57 +0100 |
| commit | 96c8582ea8a7a732db659dc99a625bd7889cfa4d (patch) | |
| tree | 9a48e6b777a9afae1b2593c1d2bba2ffaf756f5c /Android.libv8.mk | |
| parent | 053d10c438f14580aaf4ab1b2aad93a5a4fe8b82 (diff) | |
| download | android_external_v8-96c8582ea8a7a732db659dc99a625bd7889cfa4d.tar.gz android_external_v8-96c8582ea8a7a732db659dc99a625bd7889cfa4d.tar.bz2 android_external_v8-96c8582ea8a7a732db659dc99a625bd7889cfa4d.zip | |
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
Diffstat (limited to 'Android.libv8.mk')
| -rw-r--r-- | Android.libv8.mk | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/Android.libv8.mk b/Android.libv8.mk index 7f7cb225..27de47c2 100644 --- a/Android.libv8.mk +++ b/Android.libv8.mk @@ -26,7 +26,6 @@ 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 @@ -36,7 +35,7 @@ $(JS2C_PY): $(intermediates)/%.py : $(LOCAL_PATH)/tools/%.py | $(ACP) $(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 @@ $(GEN1): $(LOCAL_JS_LIBRARY_FILES) $(JS2C_PY) 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 |