From e431e2758d62cf56f7f347f5a8c9d79e41b6dcd7 Mon Sep 17 00:00:00 2001 From: Steven Moreland Date: Tue, 18 Jul 2017 16:53:49 -0700 Subject: art: use proper nativehelper headers libnativeheader exports headers under nativeheader. These were available before incorrectly as global headers in order to give access to jni.h. Test: modules using art find headers Bug: 63762847 Change-Id: I5c820d677e94e07b2859e78610bc997fe51b41dc --- runtime/native/java_lang_Class.cc | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'runtime/native/java_lang_Class.cc') diff --git a/runtime/native/java_lang_Class.cc b/runtime/native/java_lang_Class.cc index d3377be393..1a19940993 100644 --- a/runtime/native/java_lang_Class.cc +++ b/runtime/native/java_lang_Class.cc @@ -18,8 +18,6 @@ #include -#include "nativehelper/jni_macros.h" - #include "art_field-inl.h" #include "art_method-inl.h" #include "base/enums.h" @@ -28,7 +26,6 @@ #include "dex_file-inl.h" #include "dex_file_annotations.h" #include "jni_internal.h" -#include "nth_caller_visitor.h" #include "mirror/class-inl.h" #include "mirror/class_loader.h" #include "mirror/field-inl.h" @@ -37,12 +34,14 @@ #include "mirror/object_array-inl.h" #include "mirror/string-inl.h" #include "native_util.h" +#include "nativehelper/jni_macros.h" +#include "nativehelper/ScopedLocalRef.h" +#include "nativehelper/ScopedUtfChars.h" +#include "nth_caller_visitor.h" #include "obj_ptr-inl.h" #include "reflection.h" -#include "scoped_thread_state_change-inl.h" #include "scoped_fast_native_object_access-inl.h" -#include "ScopedLocalRef.h" -#include "ScopedUtfChars.h" +#include "scoped_thread_state_change-inl.h" #include "utf.h" #include "well_known_classes.h" -- cgit v1.2.3-59-g8ed1b