diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-04-30 22:54:32 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-04-30 22:54:32 -0700 |
| commit | 49d5c830434f71acbdddff1ac0985fa049efd5ee (patch) | |
| tree | 895b4382dbde5e6e0697c75d53b7c1fe41d011ba | |
| parent | db1b4389239a7132c9cde0915dbd3f775dc1027a (diff) | |
| parent | d5ee4b89f462d11f8027aba6409b41aa94a4056a (diff) | |
| download | v8-49d5c830434f71acbdddff1ac0985fa049efd5ee.tar.gz | |
am d5ee4b89: Merge "Build a different mksnapshot for each arch."
* commit 'd5ee4b89f462d11f8027aba6409b41aa94a4056a':
Build a different mksnapshot for each arch.
| -rw-r--r-- | Android.libv8.mk | 6 | ||||
| -rw-r--r-- | Android.mksnapshot.mk | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/Android.libv8.mk b/Android.libv8.mk index e7c4135a..81d8296b 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 @@ -65,7 +65,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 a94c02b4..1672963a 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 := |