ART: Move CheckJNI to runtime/jni
Follow-up to commit a3ad0cdd711857f04f477e2cdc5b56a2c74a3018.
Test: mmma art
Change-Id: I4eec2d9f7befb6fe94f9ffb5ace3cb0973be7596
diff --git a/runtime/Android.bp b/runtime/Android.bp
index 1168798..b347019 100644
--- a/runtime/Android.bp
+++ b/runtime/Android.bp
@@ -37,7 +37,6 @@
"base/quasi_atomic.cc",
"base/timing_logger.cc",
"cha.cc",
- "check_jni.cc",
"class_linker.cc",
"class_loader_context.cc",
"class_root.cc",
@@ -112,6 +111,7 @@
"jit/jit_code_cache.cc",
"jit/profiling_info.cc",
"jit/profile_saver.cc",
+ "jni/check_jni.cc",
"jni/java_vm_ext.cc",
"jni/jni_env_ext.cc",
"jni/jni_internal.cc",
diff --git a/runtime/check_jni.cc b/runtime/jni/check_jni.cc
similarity index 99%
rename from runtime/check_jni.cc
rename to runtime/jni/check_jni.cc
index a875498..7919c32 100644
--- a/runtime/check_jni.cc
+++ b/runtime/jni/check_jni.cc
@@ -35,8 +35,8 @@
#include "dex/descriptors_names.h"
#include "dex/dex_file-inl.h"
#include "gc/space/space.h"
-#include "jni/java_vm_ext.h"
-#include "jni/jni_internal.h"
+#include "java_vm_ext.h"
+#include "jni_internal.h"
#include "mirror/class-inl.h"
#include "mirror/field.h"
#include "mirror/method.h"
diff --git a/runtime/check_jni.h b/runtime/jni/check_jni.h
similarity index 87%
rename from runtime/check_jni.h
rename to runtime/jni/check_jni.h
index f41abf8..10fdfe8 100644
--- a/runtime/check_jni.h
+++ b/runtime/jni/check_jni.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ART_RUNTIME_CHECK_JNI_H_
-#define ART_RUNTIME_CHECK_JNI_H_
+#ifndef ART_RUNTIME_JNI_CHECK_JNI_H_
+#define ART_RUNTIME_JNI_CHECK_JNI_H_
#include <jni.h>
@@ -26,4 +26,4 @@
} // namespace art
-#endif // ART_RUNTIME_CHECK_JNI_H_
+#endif // ART_RUNTIME_JNI_CHECK_JNI_H_