commit 96be13e2dcf87e3b8f6a14d1294023551314327b
author Stephen Hines <srhines@google.com> Fri Feb 19 01:23:16 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Feb 19 01:23:16 2016 +0000
tree 241b3528d7b2d46de14dbc83c9f00c1ff437d6c9
parent ee925db7b71d71ba6832fd0dc2d69b939858368f
parent 6c78d34b61c3acaee658c673f3595949e5c60357

Merge "Revert "Fix broken mips build, where clang is generating an invalid movn.""

Android.mk

diff --git a/Android.mk b/Android.mk
index 86324b2..8141ec0 100644
--- a/Android.mk
+++ b/Android.mk
@@ -34,12 +34,6 @@
 local_cflags_for_slang := -Wall -Werror -std=c++11
 ifeq ($(TARGET_BUILD_VARIANT),eng)
 local_cflags_for_slang += -O0 -D__ENABLE_INTERNAL_OPTIONS
-
-# Bug: 25132399
-ifneq (,$(filter mips mips64,$(TARGET_ARCH)))
-local_cflags_for_slang += -O1
-endif
-
 else
 ifeq ($(TARGET_BUILD_VARIANT),userdebug)
 else