From 68a13761e28d34f90fa0140363616dda73ad49de Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Queru Date: Sat, 28 Apr 2012 10:43:39 -0700 Subject: Build a different mksnapshot for each arch. Since mksnapshot uses different source files for each arch, building it in a single location fails when switching between builds. This uses a separate version for each arch, using the same variable that is used to select which source files get built. Change-Id: I8608bf3b0f85571c75c7f6b21e47091ef8ed8c3f --- Android.libv8.mk | 6 +++--- Android.mksnapshot.mk | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Android.libv8.mk b/Android.libv8.mk index 913c525f..7192cccb 100644 --- a/Android.libv8.mk +++ b/Android.libv8.mk @@ -11,8 +11,8 @@ LOCAL_MODULE := libv8 LOCAL_MODULE_CLASS := STATIC_LIBRARIES intermediates := $(call local-intermediates-dir) -PRIVATE_CLEAN_FILES := $(HOST_OUT)/bin/mksnapshot \ - $(HOST_OUT)/obj/EXECUTABLES/mksnapshot_intermediates +PRIVATE_CLEAN_FILES := $(HOST_OUT)/bin/mksnapshot.$(TARGET_ARCH) \ + $(HOST_OUT)/obj/EXECUTABLES/mksnapshot.$(TARGET_ARCH)_intermediates # Android.v8common.mk defines common V8_LOCAL_SRC_FILES # and V8_LOCAL_JS_LIBRARY_FILES @@ -50,7 +50,7 @@ LOCAL_GENERATED_SOURCES += $(V8_GENERATED_LIBRARIES) # Generate snapshot.cc ifeq ($(ENABLE_V8_SNAPSHOT),true) SNAP_GEN := $(intermediates)/snapshot.cc -MKSNAPSHOT := $(HOST_OUT_EXECUTABLES)/mksnapshot +MKSNAPSHOT := $(HOST_OUT_EXECUTABLES)/mksnapshot.$(TARGET_ARCH) $(SNAP_GEN): PRIVATE_CUSTOM_TOOL = $(MKSNAPSHOT) --logfile $(intermediates)/v8.log $(SNAP_GEN) $(SNAP_GEN): $(MKSNAPSHOT) $(transform-generated-source) diff --git a/Android.mksnapshot.mk b/Android.mksnapshot.mk index 9b2a68b0..c1326e03 100644 --- a/Android.mksnapshot.mk +++ b/Android.mksnapshot.mk @@ -6,8 +6,9 @@ include $(CLEAR_VARS) # Set up the target identity LOCAL_IS_HOST_MODULE := true -LOCAL_MODULE := mksnapshot +LOCAL_MODULE := mksnapshot.$(TARGET_ARCH) LOCAL_MODULE_CLASS := EXECUTABLES +LOCAL_MODULE_TAGS = optional intermediates := $(call local-intermediates-dir) V8_LOCAL_SRC_FILES := -- cgit v1.2.3