diff options
Diffstat (limited to 'runtime/Android.mk')
| -rw-r--r-- | runtime/Android.mk | 59 |
1 files changed, 26 insertions, 33 deletions
diff --git a/runtime/Android.mk b/runtime/Android.mk index b31eaf60d8..0e50eeb156 100644 --- a/runtime/Android.mk +++ b/runtime/Android.mk @@ -376,39 +376,17 @@ LIBART_ENUM_OPERATOR_OUT_HEADER_FILES := \ verifier/method_verifier.h LIBOPENJDKJVM_SRC_FILES := openjdkjvm/OpenjdkJvm.cc +LIBOPENJDKJVMTI_SRC_FILES := openjdkjvmti/OpenjdkJvmTi.cc LIBART_CFLAGS := -DBUILDING_LIBART=1 LIBART_TARGET_CFLAGS := LIBART_HOST_CFLAGS := -# Default dex2oat instruction set features. -LIBART_HOST_DEFAULT_INSTRUCTION_SET_FEATURES := default -LIBART_TARGET_DEFAULT_INSTRUCTION_SET_FEATURES := default -2ND_LIBART_TARGET_DEFAULT_INSTRUCTION_SET_FEATURES := default -ifeq ($(DEX2OAT_TARGET_ARCH),arm) - ifneq (,$(filter $(DEX2OAT_TARGET_CPU_VARIANT),cortex-a15 krait denver)) - LIBART_TARGET_DEFAULT_INSTRUCTION_SET_FEATURES := atomic_ldrd_strd,div - else - ifneq (,$(filter $(DEX2OAT_TARGET_CPU_VARIANT),cortex-a7)) - LIBART_TARGET_DEFAULT_INSTRUCTION_SET_FEATURES := div - endif - endif -endif -ifeq ($(2ND_DEX2OAT_TARGET_ARCH),arm) - ifneq (,$(filter $(DEX2OAT_TARGET_CPU_VARIANT),cortex-a15 krait denver)) - 2ND_LIBART_TARGET_DEFAULT_INSTRUCTION_SET_FEATURES := atomic_ldrd_strd,div - else - ifneq (,$(filter $(DEX2OAT_TARGET_CPU_VARIANT),cortex-a7)) - 2ND_LIBART_TARGET_DEFAULT_INSTRUCTION_SET_FEATURES := div - endif - endif -endif - # $(1): target or host # $(2): ndebug or debug # $(3): static or shared (note that static only applies for host) -# $(4): module name : either libart or libopenjdkjvm +# $(4): module name : either libart, libopenjdkjvm, or libopenjdkjvmti define build-runtime-library ifneq ($(1),target) ifneq ($(1),host) @@ -422,7 +400,9 @@ define build-runtime-library endif ifneq ($(4),libart) ifneq ($(4),libopenjdkjvm) - $$(error expected libart or libopenjdkjvm for argument 4, received $(4)) + ifneq ($(4),libopenjdkjvmti) + $$(error expected libart, libopenjdkjvmti, or libopenjdkjvm for argument 4, received $(4)) + endif endif endif @@ -460,8 +440,12 @@ define build-runtime-library LOCAL_SRC_FILES_64 := $$(LIBART_HOST_SRC_FILES_64) LOCAL_IS_HOST_MODULE := true endif - else # libopenjdkjvm - LOCAL_SRC_FILES := $$(LIBOPENJDKJVM_SRC_FILES) + else + ifeq ($(4),libopenjdkjvmti) + LOCAL_SRC_FILES := $$(LIBOPENJDKJVMTI_SRC_FILES) + else # libopenjdkjvm + LOCAL_SRC_FILES := $$(LIBOPENJDKJVM_SRC_FILES) + endif ifeq ($$(art_target_or_host),host) LOCAL_IS_HOST_MODULE := true endif @@ -500,8 +484,6 @@ endif $$(eval LOCAL_CLANG := $$(ART_TARGET_CLANG)) $$(eval $$(call set-target-local-cflags-vars,$(2))) LOCAL_ASFLAGS_arm += -no-integrated-as - LOCAL_CFLAGS_$(DEX2OAT_TARGET_ARCH) += -DART_DEFAULT_INSTRUCTION_SET_FEATURES="$(LIBART_TARGET_DEFAULT_INSTRUCTION_SET_FEATURES)" - LOCAL_CFLAGS_$(2ND_DEX2OAT_TARGET_ARCH) += -DART_DEFAULT_INSTRUCTION_SET_FEATURES="$(2ND_LIBART_TARGET_DEFAULT_INSTRUCTION_SET_FEATURES)" else # host LOCAL_CLANG := $$(ART_HOST_CLANG) LOCAL_LDLIBS += -ldl -lpthread @@ -509,7 +491,6 @@ endif LOCAL_LDLIBS += -lrt endif LOCAL_CFLAGS += $$(ART_HOST_CFLAGS) - LOCAL_CFLAGS += -DART_DEFAULT_INSTRUCTION_SET_FEATURES="$(LIBART_HOST_DEFAULT_INSTRUCTION_SET_FEATURES)" LOCAL_ASFLAGS += $$(ART_HOST_ASFLAGS) ifeq ($$(art_ndebug_or_debug),debug) @@ -570,6 +551,15 @@ endif LOCAL_SHARED_LIBRARIES += libartd endif LOCAL_NOTICE_FILE := $(LOCAL_PATH)/openjdkjvm/NOTICE + else + ifeq ($(4),libopenjdkjvmti) + ifeq ($$(art_ndebug_or_debug),ndebug) + LOCAL_SHARED_LIBRARIES += libart + else + LOCAL_SHARED_LIBRARIES += libartd + endif + LOCAL_NOTICE_FILE := $(LOCAL_PATH)/openjdkjvmti/NOTICE + endif endif LOCAL_ADDITIONAL_DEPENDENCIES := art/build/Android.common_build.mk LOCAL_ADDITIONAL_DEPENDENCIES += $$(LOCAL_PATH)/Android.mk @@ -609,17 +599,21 @@ endef ifeq ($(ART_BUILD_HOST_NDEBUG),true) $(eval $(call build-runtime-library,host,ndebug,shared,libart)) $(eval $(call build-runtime-library,host,ndebug,shared,libopenjdkjvm)) + $(eval $(call build-runtime-library,host,ndebug,shared,libopenjdkjvmti)) ifeq ($(ART_BUILD_HOST_STATIC),true) $(eval $(call build-runtime-library,host,ndebug,static,libart)) $(eval $(call build-runtime-library,host,ndebug,static,libopenjdkjvm)) + $(eval $(call build-runtime-library,host,ndebug,static,libopenjdkjvmti)) endif endif ifeq ($(ART_BUILD_HOST_DEBUG),true) $(eval $(call build-runtime-library,host,debug,shared,libart)) $(eval $(call build-runtime-library,host,debug,shared,libopenjdkjvm)) + $(eval $(call build-runtime-library,host,debug,shared,libopenjdkjvmti)) ifeq ($(ART_BUILD_HOST_STATIC),true) $(eval $(call build-runtime-library,host,debug,static,libart)) $(eval $(call build-runtime-library,host,debug,static,libopenjdkjvm)) + $(eval $(call build-runtime-library,host,debug,static,libopenjdkjvmti)) endif endif @@ -627,18 +621,17 @@ ifeq ($(ART_BUILD_TARGET_NDEBUG),true) # $(error $(call build-runtime-library,target,ndebug)) $(eval $(call build-runtime-library,target,ndebug,shared,libart)) $(eval $(call build-runtime-library,target,ndebug,shared,libopenjdkjvm)) + $(eval $(call build-runtime-library,target,ndebug,shared,libopenjdkjvmti)) endif ifeq ($(ART_BUILD_TARGET_DEBUG),true) $(eval $(call build-runtime-library,target,debug,shared,libart)) $(eval $(call build-runtime-library,target,debug,shared,libopenjdkjvm)) + $(eval $(call build-runtime-library,target,debug,shared,libopenjdkjvmti)) endif # Clear locally defined variables. LOCAL_PATH := LIBART_COMMON_SRC_FILES := -LIBART_HOST_DEFAULT_INSTRUCTION_SET_FEATURES := -LIBART_TARGET_DEFAULT_INSTRUCTION_SET_FEATURES := -2ND_LIBART_TARGET_DEFAULT_INSTRUCTION_SET_FEATURES := LIBART_HOST_LDFLAGS := LIBART_TARGET_LDFLAGS := LIBART_TARGET_LDFLAGS_arm := |