diff options
| author | Brian Carlstrom <bdc@google.com> | 2014-06-29 15:03:29 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2014-06-29 15:23:23 -0700 |
| commit | 906c27d7cb57c11c48d370b1cd6b534c362e2f53 (patch) | |
| tree | 2d58808ecc3466cb7c6f655c50ba9647057427ba /dalvikvm | |
| parent | 642fa1e747b7a97b62267cf04959eb0e7543de3f (diff) | |
| download | art-906c27d7cb57c11c48d370b1cd6b534c362e2f53.zip art-906c27d7cb57c11c48d370b1cd6b534c362e2f53.tar.gz art-906c27d7cb57c11c48d370b1cd6b534c362e2f53.tar.bz2 | |
Make ART_HOST_EXECUTABLES and ART_TARGET_SUPPORTED_ARCH include dalvikvm32 and dalvikvm64 as needed
Change-Id: Ica949eb73c081f10d28cc2fcfeb8e968eb1d52bb
Diffstat (limited to 'dalvikvm')
| -rw-r--r-- | dalvikvm/Android.mk | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/dalvikvm/Android.mk b/dalvikvm/Android.mk index 9f28341..a06b5c5 100644 --- a/dalvikvm/Android.mk +++ b/dalvikvm/Android.mk @@ -16,6 +16,8 @@ LOCAL_PATH := $(call my-dir) +include art/build/Android.common.mk + dalvikvm_cflags := -Wall -Werror -Wextra -std=gnu++11 include $(CLEAR_VARS) @@ -27,6 +29,7 @@ LOCAL_CFLAGS := $(dalvikvm_cflags) LOCAL_C_INCLUDES := art/runtime LOCAL_SHARED_LIBRARIES := libdl libnativehelper LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk +LOCAL_ADDITIONAL_DEPENDENCIES += art/build/Android.common.mk LOCAL_MULTILIB := both LOCAL_MODULE_STEM_32 := dalvikvm32 LOCAL_MODULE_STEM_64 := dalvikvm64 @@ -37,6 +40,10 @@ include $(BUILD_EXECUTABLE) include $(BUILD_SYSTEM)/executable_prefer_symlink.mk ART_TARGET_EXECUTABLES += $(TARGET_OUT_EXECUTABLES)/$(LOCAL_MODULE) +ART_TARGET_EXECUTABLES += $(TARGET_OUT_EXECUTABLES)/$(LOCAL_MODULE)$(ART_PHONY_TEST_TARGET_SUFFIX) +ifdef 2ND_ART_PHONY_TEST_TARGET_SUFFIX + ART_TARGET_EXECUTABLES += $(TARGET_OUT_EXECUTABLES)/$(LOCAL_MODULE)$(2ND_ART_PHONY_TEST_TARGET_SUFFIX) +endif include $(CLEAR_VARS) LOCAL_MODULE := dalvikvm @@ -48,7 +55,8 @@ LOCAL_CFLAGS := $(dalvikvm_cflags) LOCAL_C_INCLUDES := art/runtime LOCAL_SHARED_LIBRARIES := libnativehelper LOCAL_LDFLAGS := -ldl -lpthread -LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk +LOCAL_ADDITIONAL_DEPENDENCIES += $(LOCAL_PATH)/Android.mk +LOCAL_ADDITIONAL_DEPENDENCIES += art/build/Android.common.mk LOCAL_IS_HOST_MODULE := true LOCAL_MULTILIB := both LOCAL_MODULE_STEM_32 := dalvikvm32 @@ -60,3 +68,7 @@ include $(BUILD_HOST_EXECUTABLE) include $(BUILD_SYSTEM)/executable_prefer_symlink.mk ART_HOST_EXECUTABLES += $(HOST_OUT_EXECUTABLES)/$(LOCAL_MODULE) +ART_HOST_EXECUTABLES += $(HOST_OUT_EXECUTABLES)/$(LOCAL_MODULE)$(ART_PHONY_TEST_HOST_SUFFIX) +ifdef 2ND_ART_PHONY_TEST_HOST_SUFFIX + ART_HOST_EXECUTABLES += $(HOST_OUT_EXECUTABLES)/$(LOCAL_MODULE)$(2ND_ART_PHONY_TEST_HOST_SUFFIX) +endif |