diff options
| author | 2013-08-15 22:41:45 +0000 | |
|---|---|---|
| committer | 2013-08-15 22:41:45 +0000 | |
| commit | a68f43fa91531b2e8fe73fa5a5731f18a80ff801 (patch) | |
| tree | 74e3d94f72fec08a84864ce01e09b51e09b3438d | |
| parent | 777e391a6822d2924726feb8e67ac94fda0a2416 (diff) | |
| parent | 8d11af55067676eba0e210f05f340784f541c4c7 (diff) | |
Merge "Switch GCC -O flags, O3 non-debug, 01 debug." into dalvik-dev
| -rw-r--r-- | build/Android.common.mk | 6 | ||||
| -rw-r--r-- | test/ReferenceMap/stack_walk_refmap_jni.cc | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/build/Android.common.mk b/build/Android.common.mk index 786b1de06c..ac1be1e28a 100644 --- a/build/Android.common.mk +++ b/build/Android.common.mk @@ -109,7 +109,6 @@ ART_C_INCLUDES := \ art_cflags := \ -fno-rtti \ - -O2 \ -std=gnu++11 \ -ggdb3 \ -Wall \ @@ -131,8 +130,11 @@ ifeq ($(HOST_OS),linux) -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 1f6e307f26..180db4c230 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" |