diff options
author | Brian Carlstrom <bdc@google.com> | 2015-01-30 10:18:03 -0800 |
---|---|---|
committer | Brian Carlstrom <bdc@google.com> | 2015-01-30 10:18:03 -0800 |
commit | 02c5f4dbc26d3a055953a5ac4578817bc0375b41 (patch) | |
tree | 980c75c6fce53f7d8ec5f7f50450b21381766e9b /runtime/runtime.cc | |
parent | 9544368685b4aa65e746332e602491a3e8e5b247 (diff) | |
download | art-02c5f4dbc26d3a055953a5ac4578817bc0375b41.zip art-02c5f4dbc26d3a055953a5ac4578817bc0375b41.tar.gz art-02c5f4dbc26d3a055953a5ac4578817bc0375b41.tar.bz2 |
Remove some unused cutils/properties.h references
Also remove an obsolete include workaround
Change-Id: Ie17387280285b969c4e9b5334bafde8239b9faf6
Diffstat (limited to 'runtime/runtime.cc')
-rw-r--r-- | runtime/runtime.cc | 33 |
1 files changed, 14 insertions, 19 deletions
diff --git a/runtime/runtime.cc b/runtime/runtime.cc index 57a849a..3acac3a 100644 --- a/runtime/runtime.cc +++ b/runtime/runtime.cc @@ -33,6 +33,8 @@ #include <vector> #include <fcntl.h> +#include "JniConstants.h" +#include "ScopedLocalRef.h" #include "arch/arm/quick_method_frame_info_arm.h" #include "arch/arm/registers_arm.h" #include "arch/arm64/quick_method_frame_info_arm64.h" @@ -59,19 +61,19 @@ #include "gc/heap.h" #include "gc/space/image_space.h" #include "gc/space/space.h" +#include "handle_scope-inl.h" #include "image.h" #include "instrumentation.h" #include "intern_table.h" #include "jni_internal.h" +#include "mirror/array.h" #include "mirror/art_field-inl.h" #include "mirror/art_method-inl.h" -#include "mirror/array.h" #include "mirror/class-inl.h" #include "mirror/class_loader.h" #include "mirror/stack_trace_element.h" #include "mirror/throwable.h" #include "monitor.h" -#include "native_bridge_art_interface.h" #include "native/dalvik_system_DexFile.h" #include "native/dalvik_system_VMDebug.h" #include "native/dalvik_system_VMRuntime.h" @@ -80,48 +82,41 @@ #include "native/java_lang_Class.h" #include "native/java_lang_DexCache.h" #include "native/java_lang_Object.h" -#include "native/java_lang_ref_FinalizerReference.h" -#include "native/java_lang_reflect_Array.h" -#include "native/java_lang_reflect_Constructor.h" -#include "native/java_lang_reflect_Field.h" -#include "native/java_lang_reflect_Method.h" -#include "native/java_lang_reflect_Proxy.h" -#include "native/java_lang_ref_Reference.h" #include "native/java_lang_Runtime.h" #include "native/java_lang_String.h" #include "native/java_lang_System.h" #include "native/java_lang_Thread.h" #include "native/java_lang_Throwable.h" #include "native/java_lang_VMClassLoader.h" +#include "native/java_lang_ref_FinalizerReference.h" +#include "native/java_lang_ref_Reference.h" +#include "native/java_lang_reflect_Array.h" +#include "native/java_lang_reflect_Constructor.h" +#include "native/java_lang_reflect_Field.h" +#include "native/java_lang_reflect_Method.h" +#include "native/java_lang_reflect_Proxy.h" #include "native/java_util_concurrent_atomic_AtomicLong.h" #include "native/org_apache_harmony_dalvik_ddmc_DdmServer.h" #include "native/org_apache_harmony_dalvik_ddmc_DdmVmInternal.h" #include "native/sun_misc_Unsafe.h" -#include "parsed_options.h" +#include "native_bridge_art_interface.h" #include "oat_file.h" #include "os.h" +#include "parsed_options.h" +#include "profiler.h" #include "quick/quick_method_frame_info.h" #include "reflection.h" -#include "ScopedLocalRef.h" #include "scoped_thread_state_change.h" #include "sigchain.h" #include "signal_catcher.h" #include "signal_set.h" -#include "handle_scope-inl.h" #include "thread.h" #include "thread_list.h" #include "trace.h" #include "transaction.h" -#include "profiler.h" #include "verifier/method_verifier.h" #include "well_known_classes.h" -#include "JniConstants.h" // Last to avoid LOG redefinition in ics-mr1-plus-art. - -#ifdef HAVE_ANDROID_OS -#include "cutils/properties.h" -#endif - namespace art { // If a signal isn't handled properly, enable a handler that attempts to dump the Java stack. |