commit ace52e6a56231f53c0d94ad016b4271043941ff6
author Linux Build Service Account <lnxbuild@quicinc.com> Thu May 11 00:08:49 2017 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu May 11 00:08:49 2017 -0700
tree 7428288499b6f86759c31698bee9d59ea9b24a91
parent ca6cff4ac1484ab27afcf9ce29b756368d25d171
parent 7f1982b6324722681fdc1e66069919c1cdd1fb62

Merge "Revert "On userdebug/eng builds, disable compiler optimizations in ART""

runtime/Android.mk

diff --git a/runtime/Android.mk b/runtime/Android.mk
index 839bbba..aa12c83 100644
--- a/runtime/Android.mk
+++ b/runtime/Android.mk
@@ -528,10 +528,6 @@
   LOCAL_C_INCLUDES += art/sigchainlib
   LOCAL_C_INCLUDES += art
 
-  ifneq ($(TARGET_BUILD_VARIANT),user)
-    LOCAL_CFLAGS += -O0 -Wno-frame-larger-than=
-  endif
-
   ifeq ($$(art_static_or_shared),static)
     LOCAL_STATIC_LIBRARIES := libnativehelper
     LOCAL_STATIC_LIBRARIES += libnativebridge