aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Hines <srhines@google.com>2015-10-21 06:33:08 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-10-21 06:33:08 +0000
commitc02a461907a897d3f0824a3715596803e7065416 (patch)
tree7e0aeb05e22eb8a59ba16fd1e0e2fdc50fae2980
parenta6031c8a30c269b02f5549f9e427ed0242b7493b (diff)
parent81dcc9f215d7a6ed458fe5df0d3583824f0fb56f (diff)
downloadslang-brillo-m7-mr-dev.tar.gz
Merge "Fix broken mips build, where clang is generating an invalid movn."brillo-m7-releasebrillo-m7-mr-devbrillo-m7-dev
-rw-r--r--Android.mk6
1 files changed, 6 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index 3f56193..80ad8c6 100644
--- a/Android.mk
+++ b/Android.mk
@@ -34,6 +34,12 @@ ifeq ($(TARGET_BUILD_APPS),)
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