Merge "Switch GCC -O flags, O3 non-debug, 01 debug." into dalvik-dev
diff --git a/build/Android.common.mk b/build/Android.common.mk
index 786b1de..ac1be1e 100644
--- a/build/Android.common.mk
+++ b/build/Android.common.mk
@@ -109,7 +109,6 @@
art_cflags := \
-fno-rtti \
- -O2 \
-std=gnu++11 \
-ggdb3 \
-Wall \
@@ -131,8 +130,11 @@
-Wframe-larger-than=1728
endif
+art_non_debug_cflags := \
+ -O3
+
art_debug_cflags := \
- -fno-inline \
+ -O1 \
-DDYNAMIC_ANNOTATIONS_ENABLED=1 \
-UNDEBUG
diff --git a/test/ReferenceMap/stack_walk_refmap_jni.cc b/test/ReferenceMap/stack_walk_refmap_jni.cc
index 1f6e307..180db4c 100644
--- a/test/ReferenceMap/stack_walk_refmap_jni.cc
+++ b/test/ReferenceMap/stack_walk_refmap_jni.cc
@@ -24,6 +24,7 @@
#include "mirror/art_method-inl.h"
#include "mirror/class-inl.h"
#include "mirror/object_array-inl.h"
+#include "mirror/object-inl.h"
#include "object_utils.h"
#include "scoped_thread_state_change.h"
#include "thread.h"