diff options
Diffstat (limited to 'build/Android.common_build.mk')
| -rw-r--r-- | build/Android.common_build.mk | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/build/Android.common_build.mk b/build/Android.common_build.mk index 33c2a8eb9e..b5d41d98ae 100644 --- a/build/Android.common_build.mk +++ b/build/Android.common_build.mk @@ -136,7 +136,6 @@ endif # Base set of cflags used by all things ART. art_cflags += \ -fno-rtti \ - -std=gnu++11 \ -ggdb3 \ -Wall \ -Werror \ @@ -152,24 +151,19 @@ art_cflags += \ # The architectures the compiled tools are able to run on. Setting this to 'all' will cause all # architectures to be included. -ART_TARGET_CODEGEN_ARCHS ?= all +ART_TARGET_CODEGEN_ARCHS ?= svelte ART_HOST_CODEGEN_ARCHS ?= all ifeq ($(ART_TARGET_CODEGEN_ARCHS),all) ART_TARGET_CODEGEN_ARCHS := $(sort $(ART_TARGET_SUPPORTED_ARCH) $(ART_HOST_SUPPORTED_ARCH)) - # We need to handle the fact that some compiler tests mix code from different architectures. - ART_TARGET_COMPILER_TESTS ?= true else - ART_TARGET_COMPILER_TESTS := false ifeq ($(ART_TARGET_CODEGEN_ARCHS),svelte) ART_TARGET_CODEGEN_ARCHS := $(sort $(ART_TARGET_ARCH_64) $(ART_TARGET_ARCH_32)) endif endif ifeq ($(ART_HOST_CODEGEN_ARCHS),all) ART_HOST_CODEGEN_ARCHS := $(sort $(ART_TARGET_SUPPORTED_ARCH) $(ART_HOST_SUPPORTED_ARCH)) - ART_HOST_COMPILER_TESTS ?= true else - ART_HOST_COMPILER_TESTS := false ifeq ($(ART_HOST_CODEGEN_ARCHS),svelte) ART_HOST_CODEGEN_ARCHS := $(sort $(ART_TARGET_CODEGEN_ARCHS) $(ART_HOST_ARCH_64) $(ART_HOST_ARCH_32)) endif |