commit 2cd15c35df125955e02d9c3c5178d90c6bb9a3bc
author Colin Cross <ccross@android.com> Sat Dec 19 00:14:02 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Dec 19 00:14:02 2015 +0000
tree e29f68314f4546ad6054e87c0c0c3cad4365d17f
parent f8b69bc89aa1c657e5b6232be08535e27d078b9e
parent 1cab143cd1cf4e4a889e8c9e4503ab0bbe31ab64

Merge "Re-enable optimization for clang arm64 art builds"

build/Android.common_build.mk

diff --git a/build/Android.common_build.mk b/build/Android.common_build.mk
index 43e1457..eec471e 100644
--- a/build/Android.common_build.mk
+++ b/build/Android.common_build.mk
@@ -359,12 +359,6 @@
 ART_HOST_CFLAGS += -DART_DEFAULT_INSTRUCTION_SET_FEATURES=default $(art_host_cflags)
 ART_HOST_ASFLAGS += $(art_asflags)
 
-# The latest clang update trips over many of the files in art and never finishes
-# compiling for aarch64 with -O3 (or -O2). Drop back to -O1 while we investigate
-# to stop punishing the build server.
-# Bug: http://b/23256622
-ART_TARGET_CLANG_CFLAGS_arm64 += -O1
-
 ifndef LIBART_IMG_TARGET_BASE_ADDRESS
   $(error LIBART_IMG_TARGET_BASE_ADDRESS unset)
 endif