diff options
| author | Hiroshi Yamauchi <yamauchi@google.com> | 2014-05-12 12:32:32 -0700 |
|---|---|---|
| committer | Hiroshi Yamauchi <yamauchi@google.com> | 2014-05-12 12:32:32 -0700 |
| commit | 1dda060e0f2c2d00d3b5d064d68f18d85bfa9be8 (patch) | |
| tree | 049c173b817a9d340ab9e7ef4ef5e90a6c330916 /build | |
| parent | 3d1e6642d350e23fa85d4cfcb03413a576880396 (diff) | |
| download | art-1dda060e0f2c2d00d3b5d064d68f18d85bfa9be8.zip art-1dda060e0f2c2d00d3b5d064d68f18d85bfa9be8.tar.gz art-1dda060e0f2c2d00d3b5d064d68f18d85bfa9be8.tar.bz2 | |
Make it easy to change the default GC type.
Bug: 13641307
Change-Id: I47a36326be8dbb5fd637b743bbfad1fdde54011d
Diffstat (limited to 'build')
| -rw-r--r-- | build/Android.common.mk | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/build/Android.common.mk b/build/Android.common.mk index 6135571..188ddb5 100644 --- a/build/Android.common.mk +++ b/build/Android.common.mk @@ -110,6 +110,12 @@ DEX2OAT_FLAGS := --compiler-backend=Optimizing DALVIKVM_FLAGS := -Xcompiler-option --compiler-backend=Optimizing endif +# +# Used to change the default GC. Valid values are CMS, SS, GSS. The default is CMS. +# +ART_DEFAULT_GC_TYPE ?= CMS +ART_DEFAULT_GC_TYPE_CFLAGS := -DART_DEFAULT_GC_TYPE_IS_$(ART_DEFAULT_GC_TYPE) + LLVM_ROOT_PATH := external/llvm # Don't fail a dalvik minimal host build. -include $(LLVM_ROOT_PATH)/llvm.mk @@ -237,6 +243,7 @@ art_debug_cflags := \ ART_HOST_CFLAGS := $(art_cflags) -DANDROID_SMP=1 -DART_BASE_ADDRESS=$(LIBART_IMG_HOST_BASE_ADDRESS) ART_HOST_CFLAGS += -DART_DEFAULT_INSTRUCTION_SET_FEATURES=default +ART_HOST_CFLAGS += $(ART_DEFAULT_GC_TYPE_CFLAGS) ART_TARGET_CFLAGS := $(art_cflags) -DART_TARGET -DART_BASE_ADDRESS=$(LIBART_IMG_TARGET_BASE_ADDRESS) ifeq ($(TARGET_CPU_SMP),true) @@ -244,6 +251,7 @@ ifeq ($(TARGET_CPU_SMP),true) else ART_TARGET_CFLAGS += -DANDROID_SMP=0 endif +ART_TARGET_CFLAGS += $(ART_DEFAULT_GC_TYPE_CFLAGS) # DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES is set in ../build/core/dex_preopt.mk based on # the TARGET_CPU_VARIANT |