summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Colin Cross <ccross@android.com> 2015-12-18 18:01:35 -0800
committer android-build-merger <android-build-merger@google.com> 2015-12-18 18:01:35 -0800
commitaa0fab302b762c776ecda4a5dd80625ccd64bde3 (patch)
tree961904396907d5ae7bab13f64f9eae35044e3446
parentdf0de0459ccd661c1c79aec3035dc64d4997ad3d (diff)
parent453f41e99570adeeda6fd79eccc9d8b4ce55b722 (diff)
Merge "art: use -O1 to compile tests with clang for arm64" am: 2f125e3c7a
am: 453f41e995 * commit '453f41e99570adeeda6fd79eccc9d8b4ce55b722': art: use -O1 to compile tests with clang for arm64
-rw-r--r--build/Android.gtest.mk3
1 files changed, 3 insertions, 0 deletions
diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk
index 08730d0654..99f7a2afb8 100644
--- a/build/Android.gtest.mk
+++ b/build/Android.gtest.mk
@@ -567,6 +567,9 @@ define define-art-gtest
LOCAL_MODULE_PATH_64 := $$(ART_TARGET_NATIVETEST_OUT)/$$(ART_TARGET_ARCH_64)
LOCAL_MULTILIB := both
LOCAL_CLANG_CFLAGS += -Wno-used-but-marked-unused -Wno-deprecated -Wno-missing-noreturn # gtest issue
+ # clang fails to compile art/runtime/arch/stub_test.cc for arm64 without -O1
+ # b/26275713
+ LOCAL_CLANG_CFLAGS_arm64 += -O1
include $$(BUILD_EXECUTABLE)
library_path :=
2nd_library_path :=