From 956af0f0cb05422e38c1d22cbef309d16b8a1a12 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Thu, 11 Dec 2014 14:34:28 -0800 Subject: Remove portable. Change-Id: I3bf3250fa866fd2265f1b115d52fa5dedc48a7fc --- build/Android.common_build.mk | 36 ------------------------------------ 1 file changed, 36 deletions(-) (limited to 'build/Android.common_build.mk') diff --git a/build/Android.common_build.mk b/build/Android.common_build.mk index 7620e76..1a8752f 100644 --- a/build/Android.common_build.mk +++ b/build/Android.common_build.mk @@ -59,42 +59,11 @@ ART_SMALL_MODE := true endif # -# Used to enable SEA mode -# -ART_SEA_IR_MODE := false -ifneq ($(wildcard art/SEA_IR_ART),) -$(info Enabling ART_SEA_IR_MODE because of existence of art/SEA_IR_ART) -ART_SEA_IR_MODE := true -endif -ifeq ($(WITH_ART_SEA_IR_MODE), true) -ART_SEA_IR_MODE := true -endif - -# -# Used to enable portable mode -# -ART_USE_PORTABLE_COMPILER := false -ifneq ($(wildcard art/USE_PORTABLE_COMPILER),) -$(info Enabling ART_USE_PORTABLE_COMPILER because of existence of art/USE_PORTABLE_COMPILER) -ART_USE_PORTABLE_COMPILER := true -endif -ifeq ($(WITH_ART_USE_PORTABLE_COMPILER),true) -$(info Enabling ART_USE_PORTABLE_COMPILER because WITH_ART_USE_PORTABLE_COMPILER=true) -ART_USE_PORTABLE_COMPILER := true -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) -ifeq ($(ART_USE_PORTABLE_COMPILER),true) - LLVM_ROOT_PATH := external/llvm - # Don't fail a dalvik minimal host build. - -include $(LLVM_ROOT_PATH)/llvm.mk -endif - ART_HOST_CFLAGS := ART_TARGET_CFLAGS := @@ -194,7 +163,6 @@ ART_C_INCLUDES := \ external/valgrind/main \ external/vixl/src \ external/zlib \ - frameworks/compile/mclinker/include # Base set of cflags used by all things ART. art_cflags := \ @@ -229,10 +197,6 @@ ifeq ($(ART_SMALL_MODE),true) art_cflags += -DART_SMALL_MODE=1 endif -ifeq ($(ART_SEA_IR_MODE),true) - art_cflags += -DART_SEA_IR_MODE=1 -endif - ifeq ($(ART_USE_OPTIMIZING_COMPILER),true) art_cflags += -DART_USE_OPTIMIZING_COMPILER=1 endif -- cgit v1.1