summaryrefslogtreecommitdiffstats
path: root/Android.libv8.mk
diff options
context:
space:
mode:
authorPatrick Scott <phanna@android.com>2010-03-10 17:35:25 -0500
committerPatrick Scott <phanna@android.com>2010-03-10 17:36:54 -0500
commitcf0afc1539342934cbdaf19095d303e33f492827 (patch)
treed1c7065d977a636cbb3b5ac4b48d30786333e959 /Android.libv8.mk
parent7cf6db35b06497e21a38727eb34fbdb3065e2110 (diff)
downloadandroid_external_v8-cf0afc1539342934cbdaf19095d303e33f492827.tar.gz
android_external_v8-cf0afc1539342934cbdaf19095d303e33f492827.tar.bz2
android_external_v8-cf0afc1539342934cbdaf19095d303e33f492827.zip
Fix rebuilding of snapshot.cc
Use the build rule for generated source. Depending on the binary and not the module name. Bug: 2504831 Change-Id: I977df96a6e4a98fb87defa80fc98702a5eacec9f
Diffstat (limited to 'Android.libv8.mk')
-rw-r--r--Android.libv8.mk15
1 files changed, 5 insertions, 10 deletions
diff --git a/Android.libv8.mk b/Android.libv8.mk
index ecaf762e..850df3a4 100644
--- a/Android.libv8.mk
+++ b/Android.libv8.mk
@@ -31,7 +31,6 @@ $(JS2C_PY): $(intermediates)/%.py : $(LOCAL_PATH)/tools/%.py | $(ACP)
@echo "Copying $@"
$(copy-file-to-target)
-LOCAL_GENERATED_SOURCES :=
# Generate libraries.cc
GEN1 := $(intermediates)/libraries.cc $(intermediates)/libraries-empty.cc
$(GEN1): SCRIPT := $(intermediates)/js2c.py
@@ -46,15 +45,11 @@ LOCAL_GENERATED_SOURCES += $(V8_GENERATED_LIBRARIES)
# Generate snapshot.cc
ifeq ($(ENABLE_V8_SNAPSHOT),true)
SNAP_GEN := $(intermediates)/snapshot.cc
-$(SNAP_GEN): MKSNAPSHOT := $(HOST_OUT_EXECUTABLES)/mksnapshot
-# mksnapshot is the module name. This dependency rule makes sure that mksnapshot
-# is built before calling the following rule.
-$(SNAP_GEN): mksnapshot
- @echo "Generating snapshot.cc"
- @mkdir -p $(dir $@)
- @echo $(MKSNAPSHOT) $(SNAP_GEN)
- $(MKSNAPSHOT) $(SNAP_GEN)
-LOCAL_GENERATED_SOURCES += $(intermediates)/snapshot.cc
+MKSNAPSHOT := $(HOST_OUT_EXECUTABLES)/mksnapshot
+$(SNAP_GEN): PRIVATE_CUSTOM_TOOL = $(MKSNAPSHOT) $(SNAP_GEN)
+$(SNAP_GEN): $(MKSNAPSHOT)
+ $(transform-generated-source)
+LOCAL_GENERATED_SOURCES += $(SNAP_GEN)
else
LOCAL_SRC_FILES += \
src/snapshot-empty.cc