commit b201b4e71cbc7a1005c5f22687bcf0cb0350b613
author Stephen Hines <srhines@google.com> Wed Oct 21 06:35:57 2015 +0000
committer android-build-merger <android-build-merger@google.com> Wed Oct 21 06:35:57 2015 +0000
tree 7e0aeb05e22eb8a59ba16fd1e0e2fdc50fae2980
parent 5d358b6c8099b46f44d330b109bce5b23315b514
parent c02a461907a897d3f0824a3715596803e7065416

Merge "Fix broken mips build, where clang is generating an invalid movn."
am: c02a461907

* commit 'c02a461907a897d3f0824a3715596803e7065416':
  Fix broken mips build, where clang is generating an invalid movn.

Android.mk

diff --git a/Android.mk b/Android.mk
index 3f56193..80ad8c6 100644
--- a/Android.mk
+++ b/Android.mk
@@ -34,6 +34,12 @@
 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