diff options
51 files changed, 76 insertions, 68 deletions
diff --git a/compiler/Android.bp b/compiler/Android.bp index c2984e1743..fe0f3c75c5 100644 --- a/compiler/Android.bp +++ b/compiler/Android.bp @@ -191,11 +191,11 @@ art_cc_defaults { shared_libs: [ "libbase", "liblzma", - "libnativehelper", ], include_dirs: ["art/disassembler"], header_libs: [ "art_cmdlineparser_headers", // For compiler_options. + "libnativehelper_header_only", ], export_include_dirs: ["."], @@ -407,7 +407,10 @@ art_cc_test { }, }, - header_libs: ["libart_simulator_headers"], + header_libs: [ + "libart_simulator_headers", + "libnativehelper_header_only", + ], shared_libs: [ "libartd-compiler", @@ -416,7 +419,6 @@ art_cc_test { "libvixld-arm64", "libbacktrace", - "libnativehelper", "libnativeloader", ], diff --git a/openjdkjvm/Android.bp b/openjdkjvm/Android.bp index 761df02553..a17899358c 100644 --- a/openjdkjvm/Android.bp +++ b/openjdkjvm/Android.bp @@ -20,7 +20,9 @@ cc_defaults { srcs: ["OpenjdkJvm.cc"], shared_libs: [ "libbase", - "libnativehelper", + ], + header_libs: [ + "libnativehelper_header_only", ], } diff --git a/openjdkjvm/OpenjdkJvm.cc b/openjdkjvm/OpenjdkJvm.cc index b212ea1c20..29ebefddea 100644 --- a/openjdkjvm/OpenjdkJvm.cc +++ b/openjdkjvm/OpenjdkJvm.cc @@ -53,8 +53,8 @@ #include "mirror/string-inl.h" #include "monitor.h" #include "native/scoped_fast_native_object_access-inl.h" -#include "nativehelper/ScopedLocalRef.h" -#include "nativehelper/ScopedUtfChars.h" +#include "nativehelper/scoped_local_ref.h" +#include "nativehelper/scoped_utf_chars.h" #include "runtime.h" #include "scoped_thread_state_change-inl.h" #include "thread.h" diff --git a/openjdkjvmti/Android.bp b/openjdkjvmti/Android.bp index 84a90d65fd..eebfec48ab 100644 --- a/openjdkjvmti/Android.bp +++ b/openjdkjvmti/Android.bp @@ -50,10 +50,12 @@ cc_defaults { "ti_timers.cc", "transform.cc", ], - header_libs: ["libopenjdkjvmti_headers"], + header_libs: [ + "libnativehelper_header_only", + "libopenjdkjvmti_headers", + ], shared_libs: [ "libbase", - "libnativehelper", ], } diff --git a/openjdkjvmti/events-inl.h b/openjdkjvmti/events-inl.h index 3973e9432f..d97916fa0a 100644 --- a/openjdkjvmti/events-inl.h +++ b/openjdkjvmti/events-inl.h @@ -24,7 +24,7 @@ #include "base/mutex-inl.h" #include "events.h" #include "jni_internal.h" -#include "nativehelper/ScopedLocalRef.h" +#include "nativehelper/scoped_local_ref.h" #include "scoped_thread_state_change-inl.h" #include "ti_breakpoint.h" diff --git a/openjdkjvmti/events.cc b/openjdkjvmti/events.cc index 0282fbce1f..381dc1f036 100644 --- a/openjdkjvmti/events.cc +++ b/openjdkjvmti/events.cc @@ -49,7 +49,7 @@ #include "mirror/class.h" #include "mirror/object-inl.h" #include "monitor.h" -#include "nativehelper/ScopedLocalRef.h" +#include "nativehelper/scoped_local_ref.h" #include "runtime.h" #include "scoped_thread_state_change-inl.h" #include "stack.h" diff --git a/openjdkjvmti/jvmti_weak_table-inl.h b/openjdkjvmti/jvmti_weak_table-inl.h index 1c82255fff..5d20946070 100644 --- a/openjdkjvmti/jvmti_weak_table-inl.h +++ b/openjdkjvmti/jvmti_weak_table-inl.h @@ -44,7 +44,7 @@ #include "jvmti_allocator.h" #include "mirror/class.h" #include "mirror/object.h" -#include "nativehelper/ScopedLocalRef.h" +#include "nativehelper/scoped_local_ref.h" #include "runtime.h" namespace openjdkjvmti { diff --git a/openjdkjvmti/ti_breakpoint.cc b/openjdkjvmti/ti_breakpoint.cc index 75c8027b22..9c3687fffd 100644 --- a/openjdkjvmti/ti_breakpoint.cc +++ b/openjdkjvmti/ti_breakpoint.cc @@ -43,7 +43,7 @@ #include "mirror/class-inl.h" #include "mirror/object_array-inl.h" #include "modifiers.h" -#include "nativehelper/ScopedLocalRef.h" +#include "nativehelper/scoped_local_ref.h" #include "runtime_callbacks.h" #include "scoped_thread_state_change-inl.h" #include "thread-current-inl.h" diff --git a/openjdkjvmti/ti_class.cc b/openjdkjvmti/ti_class.cc index 5f29416134..e69c78bab1 100644 --- a/openjdkjvmti/ti_class.cc +++ b/openjdkjvmti/ti_class.cc @@ -60,7 +60,7 @@ #include "mirror/object_array-inl.h" #include "mirror/object_reference.h" #include "mirror/reference.h" -#include "nativehelper/ScopedLocalRef.h" +#include "nativehelper/scoped_local_ref.h" #include "primitive.h" #include "reflection.h" #include "runtime.h" diff --git a/openjdkjvmti/ti_class_loader.cc b/openjdkjvmti/ti_class_loader.cc index e81e4bc803..b551b55e18 100644 --- a/openjdkjvmti/ti_class_loader.cc +++ b/openjdkjvmti/ti_class_loader.cc @@ -51,7 +51,7 @@ #include "mirror/class.h" #include "mirror/class_ext.h" #include "mirror/object.h" -#include "nativehelper/ScopedLocalRef.h" +#include "nativehelper/scoped_local_ref.h" #include "object_lock.h" #include "runtime.h" #include "transform.h" diff --git a/openjdkjvmti/ti_method.cc b/openjdkjvmti/ti_method.cc index 43f5447741..41679daaa1 100644 --- a/openjdkjvmti/ti_method.cc +++ b/openjdkjvmti/ti_method.cc @@ -47,7 +47,7 @@ #include "mirror/object-inl.h" #include "mirror/object_array-inl.h" #include "modifiers.h" -#include "nativehelper/ScopedLocalRef.h" +#include "nativehelper/scoped_local_ref.h" #include "runtime_callbacks.h" #include "scoped_thread_state_change-inl.h" #include "stack.h" diff --git a/openjdkjvmti/ti_phase.cc b/openjdkjvmti/ti_phase.cc index 07cf31c354..23df27fbda 100644 --- a/openjdkjvmti/ti_phase.cc +++ b/openjdkjvmti/ti_phase.cc @@ -34,7 +34,7 @@ #include "art_jvmti.h" #include "base/macros.h" #include "events-inl.h" -#include "nativehelper/ScopedLocalRef.h" +#include "nativehelper/scoped_local_ref.h" #include "runtime.h" #include "runtime_callbacks.h" #include "scoped_thread_state_change-inl.h" diff --git a/openjdkjvmti/ti_properties.cc b/openjdkjvmti/ti_properties.cc index c412814d8d..4fb3070e93 100644 --- a/openjdkjvmti/ti_properties.cc +++ b/openjdkjvmti/ti_properties.cc @@ -35,8 +35,8 @@ #include <vector> #include "jni.h" -#include "nativehelper/ScopedLocalRef.h" -#include "nativehelper/ScopedUtfChars.h" +#include "nativehelper/scoped_local_ref.h" +#include "nativehelper/scoped_utf_chars.h" #include "art_jvmti.h" #include "runtime.h" diff --git a/openjdkjvmti/ti_redefine.cc b/openjdkjvmti/ti_redefine.cc index 53abfbca00..c4f16f5e2d 100644 --- a/openjdkjvmti/ti_redefine.cc +++ b/openjdkjvmti/ti_redefine.cc @@ -62,7 +62,7 @@ #include "mirror/class-inl.h" #include "mirror/class_ext.h" #include "mirror/object.h" -#include "nativehelper/ScopedLocalRef.h" +#include "nativehelper/scoped_local_ref.h" #include "non_debuggable_classes.h" #include "object_lock.h" #include "runtime.h" diff --git a/openjdkjvmti/ti_search.cc b/openjdkjvmti/ti_search.cc index 5c67b895fc..fe12a25151 100644 --- a/openjdkjvmti/ti_search.cc +++ b/openjdkjvmti/ti_search.cc @@ -44,7 +44,7 @@ #include "mirror/class-inl.h" #include "mirror/object.h" #include "mirror/string.h" -#include "nativehelper/ScopedLocalRef.h" +#include "nativehelper/scoped_local_ref.h" #include "obj_ptr-inl.h" #include "runtime.h" #include "runtime_callbacks.h" diff --git a/openjdkjvmti/ti_stack.cc b/openjdkjvmti/ti_stack.cc index 8c4eb0b24d..e346e16f92 100644 --- a/openjdkjvmti/ti_stack.cc +++ b/openjdkjvmti/ti_stack.cc @@ -53,7 +53,7 @@ #include "jni_internal.h" #include "mirror/class.h" #include "mirror/dex_cache.h" -#include "nativehelper/ScopedLocalRef.h" +#include "nativehelper/scoped_local_ref.h" #include "scoped_thread_state_change-inl.h" #include "stack.h" #include "ti_thread.h" diff --git a/openjdkjvmti/ti_thread.cc b/openjdkjvmti/ti_thread.cc index 389465d0b5..99dea540e5 100644 --- a/openjdkjvmti/ti_thread.cc +++ b/openjdkjvmti/ti_thread.cc @@ -43,7 +43,7 @@ #include "mirror/class.h" #include "mirror/object-inl.h" #include "mirror/string.h" -#include "nativehelper/ScopedLocalRef.h" +#include "nativehelper/scoped_local_ref.h" #include "obj_ptr.h" #include "runtime.h" #include "runtime_callbacks.h" diff --git a/runtime/Android.bp b/runtime/Android.bp index cfdac1c1b3..6d1667ad38 100644 --- a/runtime/Android.bp +++ b/runtime/Android.bp @@ -406,6 +406,7 @@ cc_defaults { ], header_libs: [ "art_cmdlineparser_headers", + "libnativehelper_header_only", ], shared_libs: [ "libnativehelper", @@ -510,7 +511,9 @@ art_cc_library { "libartd", "libbase", "libbacktrace", - "libnativehelper", + ], + header_libs: [ + "libnativehelper_header_only", ], } diff --git a/runtime/class_linker.cc b/runtime/class_linker.cc index cd7a94e3d1..584176a04f 100644 --- a/runtime/class_linker.cc +++ b/runtime/class_linker.cc @@ -99,7 +99,7 @@ #include "mirror/stack_trace_element.h" #include "mirror/string-inl.h" #include "native/dalvik_system_DexFile.h" -#include "nativehelper/ScopedLocalRef.h" +#include "nativehelper/scoped_local_ref.h" #include "oat.h" #include "oat_file-inl.h" #include "oat_file.h" diff --git a/runtime/common_runtime_test.cc b/runtime/common_runtime_test.cc index d35402fd47..149c33fa87 100644 --- a/runtime/common_runtime_test.cc +++ b/runtime/common_runtime_test.cc @@ -21,7 +21,7 @@ #include <fcntl.h> #include <stdlib.h> #include <cstdio> -#include "nativehelper/ScopedLocalRef.h" +#include "nativehelper/scoped_local_ref.h" #include "../../external/icu/icu4c/source/common/unicode/uvernum.h" #include "android-base/stringprintf.h" diff --git a/runtime/common_throws.cc b/runtime/common_throws.cc index bf2e7062ad..1e77753e87 100644 --- a/runtime/common_throws.cc +++ b/runtime/common_throws.cc @@ -31,7 +31,7 @@ #include "mirror/method_type.h" #include "mirror/object-inl.h" #include "mirror/object_array-inl.h" -#include "nativehelper/ScopedLocalRef.h" +#include "nativehelper/scoped_local_ref.h" #include "obj_ptr-inl.h" #include "thread.h" #include "verifier/method_verifier.h" diff --git a/runtime/debugger.cc b/runtime/debugger.cc index b021ff1734..85df14a576 100644 --- a/runtime/debugger.cc +++ b/runtime/debugger.cc @@ -55,8 +55,8 @@ #include "mirror/object_array-inl.h" #include "mirror/string-inl.h" #include "mirror/throwable.h" -#include "nativehelper/ScopedLocalRef.h" -#include "nativehelper/ScopedPrimitiveArray.h" +#include "nativehelper/scoped_local_ref.h" +#include "nativehelper/scoped_primitive_array.h" #include "obj_ptr-inl.h" #include "reflection.h" #include "safe_map.h" diff --git a/runtime/gc/heap.cc b/runtime/gc/heap.cc index 7328063486..4f5458212c 100644 --- a/runtime/gc/heap.cc +++ b/runtime/gc/heap.cc @@ -77,7 +77,7 @@ #include "mirror/object-refvisitor-inl.h" #include "mirror/object_array-inl.h" #include "mirror/reference-inl.h" -#include "nativehelper/ScopedLocalRef.h" +#include "nativehelper/scoped_local_ref.h" #include "obj_ptr-inl.h" #include "os.h" #include "reflection.h" diff --git a/runtime/gc/reference_processor.cc b/runtime/gc/reference_processor.cc index 42b31ab140..d58d09c794 100644 --- a/runtime/gc/reference_processor.cc +++ b/runtime/gc/reference_processor.cc @@ -22,7 +22,7 @@ #include "mirror/class-inl.h" #include "mirror/object-inl.h" #include "mirror/reference-inl.h" -#include "nativehelper/ScopedLocalRef.h" +#include "nativehelper/scoped_local_ref.h" #include "object_callbacks.h" #include "reference_processor-inl.h" #include "reflection.h" diff --git a/runtime/interpreter/interpreter.cc b/runtime/interpreter/interpreter.cc index 2deb3b7cf5..038405eebc 100644 --- a/runtime/interpreter/interpreter.cc +++ b/runtime/interpreter/interpreter.cc @@ -29,7 +29,7 @@ #include "jvalue-inl.h" #include "mirror/string-inl.h" #include "mterp/mterp.h" -#include "nativehelper/ScopedLocalRef.h" +#include "nativehelper/scoped_local_ref.h" #include "scoped_thread_state_change-inl.h" #include "stack.h" #include "thread-inl.h" diff --git a/runtime/interpreter/unstarted_runtime.cc b/runtime/interpreter/unstarted_runtime.cc index 74a7a66046..7a8ae9a9db 100644 --- a/runtime/interpreter/unstarted_runtime.cc +++ b/runtime/interpreter/unstarted_runtime.cc @@ -47,7 +47,7 @@ #include "mirror/object-inl.h" #include "mirror/object_array-inl.h" #include "mirror/string-inl.h" -#include "nativehelper/ScopedLocalRef.h" +#include "nativehelper/scoped_local_ref.h" #include "nth_caller_visitor.h" #include "reflection.h" #include "thread-inl.h" diff --git a/runtime/java_vm_ext.cc b/runtime/java_vm_ext.cc index 73746e18ef..f8b82ed313 100644 --- a/runtime/java_vm_ext.cc +++ b/runtime/java_vm_ext.cc @@ -36,8 +36,8 @@ #include "mirror/class-inl.h" #include "mirror/class_loader.h" #include "nativebridge/native_bridge.h" -#include "nativehelper/ScopedLocalRef.h" -#include "nativehelper/ScopedUtfChars.h" +#include "nativehelper/scoped_local_ref.h" +#include "nativehelper/scoped_utf_chars.h" #include "nativeloader/native_loader.h" #include "object_callbacks.h" #include "parsed_options.h" diff --git a/runtime/jni_internal.cc b/runtime/jni_internal.cc index d74cec325a..5164c85b60 100644 --- a/runtime/jni_internal.cc +++ b/runtime/jni_internal.cc @@ -49,7 +49,7 @@ #include "mirror/object_array-inl.h" #include "mirror/string-inl.h" #include "mirror/throwable.h" -#include "nativehelper/ScopedLocalRef.h" +#include "nativehelper/scoped_local_ref.h" #include "parsed_options.h" #include "reflection.h" #include "runtime.h" diff --git a/runtime/jni_internal_test.cc b/runtime/jni_internal_test.cc index 3f00450319..1ecfe7cb76 100644 --- a/runtime/jni_internal_test.cc +++ b/runtime/jni_internal_test.cc @@ -24,7 +24,7 @@ #include "java_vm_ext.h" #include "jni_env_ext.h" #include "mirror/string-inl.h" -#include "nativehelper/ScopedLocalRef.h" +#include "nativehelper/scoped_local_ref.h" #include "scoped_thread_state_change-inl.h" namespace art { diff --git a/runtime/native/dalvik_system_DexFile.cc b/runtime/native/dalvik_system_DexFile.cc index e75d097220..4ab8908ff3 100644 --- a/runtime/native/dalvik_system_DexFile.cc +++ b/runtime/native/dalvik_system_DexFile.cc @@ -33,8 +33,8 @@ #include "mirror/string.h" #include "native_util.h" #include "nativehelper/jni_macros.h" -#include "nativehelper/ScopedLocalRef.h" -#include "nativehelper/ScopedUtfChars.h" +#include "nativehelper/scoped_local_ref.h" +#include "nativehelper/scoped_utf_chars.h" #include "oat_file.h" #include "oat_file_assistant.h" #include "oat_file_manager.h" diff --git a/runtime/native/dalvik_system_VMDebug.cc b/runtime/native/dalvik_system_VMDebug.cc index 70dd5cb56d..2663bea344 100644 --- a/runtime/native/dalvik_system_VMDebug.cc +++ b/runtime/native/dalvik_system_VMDebug.cc @@ -40,8 +40,8 @@ #include "mirror/class.h" #include "mirror/object_array-inl.h" #include "native_util.h" -#include "nativehelper/ScopedLocalRef.h" -#include "nativehelper/ScopedUtfChars.h" +#include "nativehelper/scoped_local_ref.h" +#include "nativehelper/scoped_utf_chars.h" #include "scoped_fast_native_object_access-inl.h" #include "trace.h" #include "well_known_classes.h" diff --git a/runtime/native/dalvik_system_VMRuntime.cc b/runtime/native/dalvik_system_VMRuntime.cc index c5bc142459..0bbd1ece80 100644 --- a/runtime/native/dalvik_system_VMRuntime.cc +++ b/runtime/native/dalvik_system_VMRuntime.cc @@ -22,7 +22,7 @@ extern "C" void android_set_application_target_sdk_version(uint32_t version); #endif #include <limits.h> -#include "nativehelper/ScopedUtfChars.h" +#include "nativehelper/scoped_utf_chars.h" #include "android-base/stringprintf.h" @@ -48,7 +48,7 @@ extern "C" void android_set_application_target_sdk_version(uint32_t version); #include "mirror/object-inl.h" #include "native_util.h" #include "nativehelper/jni_macros.h" -#include "nativehelper/ScopedLocalRef.h" +#include "nativehelper/scoped_local_ref.h" #include "runtime.h" #include "scoped_fast_native_object_access-inl.h" #include "scoped_thread_state_change-inl.h" diff --git a/runtime/native/dalvik_system_ZygoteHooks.cc b/runtime/native/dalvik_system_ZygoteHooks.cc index af78372982..b436e0df67 100644 --- a/runtime/native/dalvik_system_ZygoteHooks.cc +++ b/runtime/native/dalvik_system_ZygoteHooks.cc @@ -29,8 +29,7 @@ #include "jni_internal.h" #include "native_util.h" #include "nativehelper/jni_macros.h" -#include "nativehelper/JNIHelp.h" -#include "nativehelper/ScopedUtfChars.h" +#include "nativehelper/scoped_utf_chars.h" #include "non_debuggable_classes.h" #include "oat_file.h" #include "oat_file_manager.h" diff --git a/runtime/native/java_lang_Class.cc b/runtime/native/java_lang_Class.cc index 1a19940993..9359ffc7fd 100644 --- a/runtime/native/java_lang_Class.cc +++ b/runtime/native/java_lang_Class.cc @@ -35,8 +35,8 @@ #include "mirror/string-inl.h" #include "native_util.h" #include "nativehelper/jni_macros.h" -#include "nativehelper/ScopedLocalRef.h" -#include "nativehelper/ScopedUtfChars.h" +#include "nativehelper/scoped_local_ref.h" +#include "nativehelper/scoped_utf_chars.h" #include "nth_caller_visitor.h" #include "obj_ptr-inl.h" #include "reflection.h" diff --git a/runtime/native/java_lang_String.cc b/runtime/native/java_lang_String.cc index 67f7c51465..9295ff7071 100644 --- a/runtime/native/java_lang_String.cc +++ b/runtime/native/java_lang_String.cc @@ -25,7 +25,7 @@ #include "mirror/string-inl.h" #include "mirror/string.h" #include "native_util.h" -#include "nativehelper/ScopedLocalRef.h" +#include "nativehelper/scoped_local_ref.h" #include "scoped_fast_native_object_access-inl.h" #include "scoped_thread_state_change-inl.h" #include "verify_object.h" diff --git a/runtime/native/java_lang_StringFactory.cc b/runtime/native/java_lang_StringFactory.cc index 2db9a5cc22..136a02f8f6 100644 --- a/runtime/native/java_lang_StringFactory.cc +++ b/runtime/native/java_lang_StringFactory.cc @@ -22,8 +22,8 @@ #include "mirror/string.h" #include "native_util.h" #include "nativehelper/jni_macros.h" -#include "nativehelper/ScopedLocalRef.h" -#include "nativehelper/ScopedPrimitiveArray.h" +#include "nativehelper/scoped_local_ref.h" +#include "nativehelper/scoped_primitive_array.h" #include "scoped_fast_native_object_access-inl.h" #include "scoped_thread_state_change-inl.h" diff --git a/runtime/native/java_lang_Thread.cc b/runtime/native/java_lang_Thread.cc index 94007ffa1e..a717264bcb 100644 --- a/runtime/native/java_lang_Thread.cc +++ b/runtime/native/java_lang_Thread.cc @@ -22,7 +22,7 @@ #include "monitor.h" #include "native_util.h" #include "nativehelper/jni_macros.h" -#include "nativehelper/ScopedUtfChars.h" +#include "nativehelper/scoped_utf_chars.h" #include "scoped_fast_native_object_access-inl.h" #include "scoped_thread_state_change-inl.h" #include "thread.h" diff --git a/runtime/native/java_lang_VMClassLoader.cc b/runtime/native/java_lang_VMClassLoader.cc index 413149c510..5130ad50e4 100644 --- a/runtime/native/java_lang_VMClassLoader.cc +++ b/runtime/native/java_lang_VMClassLoader.cc @@ -23,8 +23,8 @@ #include "mirror/object-inl.h" #include "native_util.h" #include "nativehelper/jni_macros.h" -#include "nativehelper/ScopedLocalRef.h" -#include "nativehelper/ScopedUtfChars.h" +#include "nativehelper/scoped_local_ref.h" +#include "nativehelper/scoped_utf_chars.h" #include "obj_ptr.h" #include "scoped_fast_native_object_access-inl.h" #include "well_known_classes.h" diff --git a/runtime/native/libcore_util_CharsetUtils.cc b/runtime/native/libcore_util_CharsetUtils.cc index 9743c9413d..f3aba2575b 100644 --- a/runtime/native/libcore_util_CharsetUtils.cc +++ b/runtime/native/libcore_util_CharsetUtils.cc @@ -22,7 +22,7 @@ #include "mirror/string-inl.h" #include "mirror/string.h" #include "native_util.h" -#include "nativehelper/ScopedPrimitiveArray.h" +#include "nativehelper/scoped_primitive_array.h" #include "nativehelper/jni_macros.h" #include "scoped_fast_native_object_access-inl.h" #include "unicode/utf16.h" diff --git a/runtime/native/native_util.h b/runtime/native/native_util.h index 593b3ca444..784dba319e 100644 --- a/runtime/native/native_util.h +++ b/runtime/native/native_util.h @@ -21,7 +21,7 @@ #include "android-base/logging.h" #include "base/macros.h" -#include "nativehelper/ScopedLocalRef.h" +#include "nativehelper/scoped_local_ref.h" namespace art { diff --git a/runtime/native/org_apache_harmony_dalvik_ddmc_DdmServer.cc b/runtime/native/org_apache_harmony_dalvik_ddmc_DdmServer.cc index c3e74bd112..f8f4b1f0ad 100644 --- a/runtime/native/org_apache_harmony_dalvik_ddmc_DdmServer.cc +++ b/runtime/native/org_apache_harmony_dalvik_ddmc_DdmServer.cc @@ -21,7 +21,7 @@ #include "jni_internal.h" #include "native_util.h" #include "nativehelper/jni_macros.h" -#include "nativehelper/ScopedPrimitiveArray.h" +#include "nativehelper/scoped_primitive_array.h" #include "scoped_fast_native_object_access-inl.h" namespace art { diff --git a/runtime/native/org_apache_harmony_dalvik_ddmc_DdmVmInternal.cc b/runtime/native/org_apache_harmony_dalvik_ddmc_DdmVmInternal.cc index 8c42973509..dd98e25932 100644 --- a/runtime/native/org_apache_harmony_dalvik_ddmc_DdmVmInternal.cc +++ b/runtime/native/org_apache_harmony_dalvik_ddmc_DdmVmInternal.cc @@ -23,8 +23,8 @@ #include "jni_internal.h" #include "native_util.h" #include "nativehelper/jni_macros.h" -#include "nativehelper/ScopedLocalRef.h" -#include "nativehelper/ScopedPrimitiveArray.h" +#include "nativehelper/scoped_local_ref.h" +#include "nativehelper/scoped_primitive_array.h" #include "scoped_fast_native_object_access-inl.h" #include "thread_list.h" diff --git a/runtime/non_debuggable_classes.cc b/runtime/non_debuggable_classes.cc index 871ffba2a4..7db199cd06 100644 --- a/runtime/non_debuggable_classes.cc +++ b/runtime/non_debuggable_classes.cc @@ -19,7 +19,7 @@ #include "base/logging.h" #include "jni_internal.h" #include "mirror/class-inl.h" -#include "nativehelper/ScopedLocalRef.h" +#include "nativehelper/scoped_local_ref.h" #include "obj_ptr-inl.h" #include "thread-current-inl.h" diff --git a/runtime/reflection.cc b/runtime/reflection.cc index f28f0cabe2..9683cedd4d 100644 --- a/runtime/reflection.cc +++ b/runtime/reflection.cc @@ -28,7 +28,7 @@ #include "mirror/class-inl.h" #include "mirror/executable.h" #include "mirror/object_array-inl.h" -#include "nativehelper/ScopedLocalRef.h" +#include "nativehelper/scoped_local_ref.h" #include "nth_caller_visitor.h" #include "scoped_thread_state_change-inl.h" #include "stack_reference.h" diff --git a/runtime/reflection_test.cc b/runtime/reflection_test.cc index fa2f1e5793..7794872c83 100644 --- a/runtime/reflection_test.cc +++ b/runtime/reflection_test.cc @@ -24,7 +24,7 @@ #include "common_compiler_test.h" #include "java_vm_ext.h" #include "jni_internal.h" -#include "nativehelper/ScopedLocalRef.h" +#include "nativehelper/scoped_local_ref.h" #include "scoped_thread_state_change-inl.h" namespace art { diff --git a/runtime/runtime.cc b/runtime/runtime.cc index ca6547897e..47f033fcaa 100644 --- a/runtime/runtime.cc +++ b/runtime/runtime.cc @@ -136,7 +136,7 @@ #include "native_stack_dump.h" #include "nativehelper/JniConstants.h" #include "nativehelper/JniConstants-priv.h" -#include "nativehelper/ScopedLocalRef.h" +#include "nativehelper/scoped_local_ref.h" #include "oat_file.h" #include "oat_file_manager.h" #include "object_callbacks.h" diff --git a/runtime/runtime_callbacks_test.cc b/runtime/runtime_callbacks_test.cc index ef172586cf..0b69851a55 100644 --- a/runtime/runtime_callbacks_test.cc +++ b/runtime/runtime_callbacks_test.cc @@ -38,7 +38,7 @@ #include "mirror/class-inl.h" #include "mirror/class_loader.h" #include "monitor.h" -#include "nativehelper/ScopedLocalRef.h" +#include "nativehelper/scoped_local_ref.h" #include "obj_ptr.h" #include "runtime.h" #include "scoped_thread_state_change-inl.h" diff --git a/runtime/thread.cc b/runtime/thread.cc index 3355b10ca6..47ffb4e13f 100644 --- a/runtime/thread.cc +++ b/runtime/thread.cc @@ -70,8 +70,8 @@ #include "mirror/stack_trace_element.h" #include "monitor.h" #include "native_stack_dump.h" -#include "nativehelper/ScopedLocalRef.h" -#include "nativehelper/ScopedUtfChars.h" +#include "nativehelper/scoped_local_ref.h" +#include "nativehelper/scoped_utf_chars.h" #include "nth_caller_visitor.h" #include "oat_quick_method_header.h" #include "obj_ptr-inl.h" diff --git a/runtime/thread_list.cc b/runtime/thread_list.cc index 488e4a6517..cad164c251 100644 --- a/runtime/thread_list.cc +++ b/runtime/thread_list.cc @@ -24,8 +24,8 @@ #include "android-base/stringprintf.h" #include "backtrace/BacktraceMap.h" -#include "nativehelper/ScopedLocalRef.h" -#include "nativehelper/ScopedUtfChars.h" +#include "nativehelper/scoped_local_ref.h" +#include "nativehelper/scoped_utf_chars.h" #include "base/histogram-inl.h" #include "base/mutex-inl.h" diff --git a/runtime/trace.cc b/runtime/trace.cc index 4c3fa20c9d..4b5a7610a3 100644 --- a/runtime/trace.cc +++ b/runtime/trace.cc @@ -39,7 +39,7 @@ #include "mirror/dex_cache-inl.h" #include "mirror/object-inl.h" #include "mirror/object_array-inl.h" -#include "nativehelper/ScopedLocalRef.h" +#include "nativehelper/scoped_local_ref.h" #include "os.h" #include "scoped_thread_state_change-inl.h" #include "stack.h" diff --git a/runtime/well_known_classes.cc b/runtime/well_known_classes.cc index 74d11a32de..bfcd95c846 100644 --- a/runtime/well_known_classes.cc +++ b/runtime/well_known_classes.cc @@ -27,7 +27,7 @@ #include "jni_internal.h" #include "mirror/class.h" #include "mirror/throwable.h" -#include "nativehelper/ScopedLocalRef.h" +#include "nativehelper/scoped_local_ref.h" #include "obj_ptr-inl.h" #include "scoped_thread_state_change-inl.h" #include "thread-current-inl.h" |