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.mksnapshot.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.mksnapshot.mk')
| -rw-r--r-- | Android.mksnapshot.mk | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/Android.mksnapshot.mk b/Android.mksnapshot.mk index 28e9c7bd..45be0c11 100644 --- a/Android.mksnapshot.mk +++ b/Android.mksnapshot.mk @@ -33,7 +33,6 @@ 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 @@ -43,23 +42,14 @@ $(JS2C_PY): $(intermediates)/%.py : $(LOCAL_PATH)/tools/%.py | $(ACP) $(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 \ |