Move JNI methods out of top-level.

Change-Id: Ia9c883ba9a13b205cda7b72024e2939f02583acb

23 files changed, 22 insertions, 22 deletions

diff --git a/build/Android.common.mk b/build/Android.common.mk
index 541ba55208..179d140ba9 100644
--- a/build/Android.common.mk
+++ b/build/Android.common.mk
@@ -109,11 +109,6 @@ LIBART_COMMON_SRC_FILES := \
 	src/class_loader.cc \
 	src/compiled_method.cc \
 	src/compiler.cc \
-	src/dalvik_system_DexFile.cc \
-	src/dalvik_system_VMDebug.cc \
-	src/dalvik_system_VMRuntime.cc \
-	src/dalvik_system_VMStack.cc \
-	src/dalvik_system_Zygote.cc \
 	src/debugger.cc \
 	src/dex_cache.cc \
 	src/dex_file.cc \
@@ -130,20 +125,6 @@ LIBART_COMMON_SRC_FILES := \
 	src/image_writer.cc \
 	src/indirect_reference_table.cc \
 	src/intern_table.cc \
-	src/java_lang_Class.cc \
-	src/java_lang_Object.cc \
-	src/java_lang_Runtime.cc \
-	src/java_lang_String.cc \
-	src/java_lang_System.cc \
-	src/java_lang_Thread.cc \
-	src/java_lang_Throwable.cc \
-	src/java_lang_VMClassLoader.cc \
-	src/java_lang_reflect_Array.cc \
-	src/java_lang_reflect_Constructor.cc \
-	src/java_lang_reflect_Field.cc \
-	src/java_lang_reflect_Method.cc \
-	src/java_lang_reflect_Proxy.cc \
-	src/java_util_concurrent_atomic_AtomicLong.cc \
 	src/jdwp/jdwp_event.cc \
 	src/jdwp/jdwp_expand_buf.cc \
 	src/jdwp/jdwp_handler.cc \
@@ -157,6 +138,28 @@ LIBART_COMMON_SRC_FILES := \
 	src/memory_region.cc \
 	src/monitor.cc \
 	src/mutex.cc \
+	src/native/dalvik_system_DexFile.cc \
+	src/native/dalvik_system_VMDebug.cc \
+	src/native/dalvik_system_VMRuntime.cc \
+	src/native/dalvik_system_VMStack.cc \
+	src/native/dalvik_system_Zygote.cc \
+	src/native/java_lang_Class.cc \
+	src/native/java_lang_Object.cc \
+	src/native/java_lang_Runtime.cc \
+	src/native/java_lang_String.cc \
+	src/native/java_lang_System.cc \
+	src/native/java_lang_Thread.cc \
+	src/native/java_lang_Throwable.cc \
+	src/native/java_lang_VMClassLoader.cc \
+	src/native/java_lang_reflect_Array.cc \
+	src/native/java_lang_reflect_Constructor.cc \
+	src/native/java_lang_reflect_Field.cc \
+	src/native/java_lang_reflect_Method.cc \
+	src/native/java_lang_reflect_Proxy.cc \
+	src/native/java_util_concurrent_atomic_AtomicLong.cc \
+	src/native/org_apache_harmony_dalvik_ddmc_DdmServer.cc \
+	src/native/org_apache_harmony_dalvik_ddmc_DdmVmInternal.cc \
+	src/native/sun_misc_Unsafe.cc \
 	src/oat/runtime/arm/stub_arm.cc \
 	src/oat/runtime/x86/stub_x86.cc \
 	src/oat/utils/arm/assembler_arm.cc \
@@ -169,8 +172,6 @@ LIBART_COMMON_SRC_FILES := \
 	src/oat_writer.cc \
 	src/object.cc \
 	src/offsets.cc \
-	src/org_apache_harmony_dalvik_ddmc_DdmServer.cc \
-	src/org_apache_harmony_dalvik_ddmc_DdmVmInternal.cc \
 	src/os_linux.cc \
 	src/primitive.cc \
 	src/reference_table.cc \
@@ -183,7 +184,6 @@ LIBART_COMMON_SRC_FILES := \
 	src/stack.cc \
 	src/stringpiece.cc \
 	src/stringprintf.cc \
-	src/sun_misc_Unsafe.cc \
 	src/thread.cc \
 	src/thread_list.cc \
 	src/trace.cc \
diff --git a/src/dalvik_system_DexFile.cc b/src/native/dalvik_system_DexFile.cc
index 96a1ac1636..96a1ac1636 100644
--- a/src/dalvik_system_DexFile.cc
+++ b/src/native/dalvik_system_DexFile.cc
diff --git a/src/dalvik_system_VMDebug.cc b/src/native/dalvik_system_VMDebug.cc
index f125272876..f125272876 100644
--- a/src/dalvik_system_VMDebug.cc
+++ b/src/native/dalvik_system_VMDebug.cc
diff --git a/src/dalvik_system_VMRuntime.cc b/src/native/dalvik_system_VMRuntime.cc
index 140fafffbd..140fafffbd 100644
--- a/src/dalvik_system_VMRuntime.cc
+++ b/src/native/dalvik_system_VMRuntime.cc
diff --git a/src/dalvik_system_VMStack.cc b/src/native/dalvik_system_VMStack.cc
index e0862c3788..e0862c3788 100644
--- a/src/dalvik_system_VMStack.cc
+++ b/src/native/dalvik_system_VMStack.cc
diff --git a/src/dalvik_system_Zygote.cc b/src/native/dalvik_system_Zygote.cc
index c46f949b4b..c46f949b4b 100644
--- a/src/dalvik_system_Zygote.cc
+++ b/src/native/dalvik_system_Zygote.cc
diff --git a/src/java_lang_Class.cc b/src/native/java_lang_Class.cc
index 2cd70900b1..2cd70900b1 100644
--- a/src/java_lang_Class.cc
+++ b/src/native/java_lang_Class.cc
diff --git a/src/java_lang_Object.cc b/src/native/java_lang_Object.cc
index 7c79fc1aed..7c79fc1aed 100644
--- a/src/java_lang_Object.cc
+++ b/src/native/java_lang_Object.cc
diff --git a/src/java_lang_Runtime.cc b/src/native/java_lang_Runtime.cc
index 1b5520b8de..1b5520b8de 100644
--- a/src/java_lang_Runtime.cc
+++ b/src/native/java_lang_Runtime.cc
diff --git a/src/java_lang_String.cc b/src/native/java_lang_String.cc
index 49bf234e00..49bf234e00 100644
--- a/src/java_lang_String.cc
+++ b/src/native/java_lang_String.cc
diff --git a/src/java_lang_System.cc b/src/native/java_lang_System.cc
index 741b319718..741b319718 100644
--- a/src/java_lang_System.cc
+++ b/src/native/java_lang_System.cc
diff --git a/src/java_lang_Thread.cc b/src/native/java_lang_Thread.cc
index 197c1b98e3..197c1b98e3 100644
--- a/src/java_lang_Thread.cc
+++ b/src/native/java_lang_Thread.cc
diff --git a/src/java_lang_Throwable.cc b/src/native/java_lang_Throwable.cc
index 1d730273f3..1d730273f3 100644
--- a/src/java_lang_Throwable.cc
+++ b/src/native/java_lang_Throwable.cc
diff --git a/src/java_lang_VMClassLoader.cc b/src/native/java_lang_VMClassLoader.cc
index 3d96c472c5..3d96c472c5 100644
--- a/src/java_lang_VMClassLoader.cc
+++ b/src/native/java_lang_VMClassLoader.cc
diff --git a/src/java_lang_reflect_Array.cc b/src/native/java_lang_reflect_Array.cc
index 1c86aacf8b..1c86aacf8b 100644
--- a/src/java_lang_reflect_Array.cc
+++ b/src/native/java_lang_reflect_Array.cc
diff --git a/src/java_lang_reflect_Constructor.cc b/src/native/java_lang_reflect_Constructor.cc
index 5d0434d4c7..5d0434d4c7 100644
--- a/src/java_lang_reflect_Constructor.cc
+++ b/src/native/java_lang_reflect_Constructor.cc
diff --git a/src/java_lang_reflect_Field.cc b/src/native/java_lang_reflect_Field.cc
index fe9f79ccc3..fe9f79ccc3 100644
--- a/src/java_lang_reflect_Field.cc
+++ b/src/native/java_lang_reflect_Field.cc
diff --git a/src/java_lang_reflect_Method.cc b/src/native/java_lang_reflect_Method.cc
index a5a705bab7..a5a705bab7 100644
--- a/src/java_lang_reflect_Method.cc
+++ b/src/native/java_lang_reflect_Method.cc
diff --git a/src/java_lang_reflect_Proxy.cc b/src/native/java_lang_reflect_Proxy.cc
index bac20b05da..bac20b05da 100644
--- a/src/java_lang_reflect_Proxy.cc
+++ b/src/native/java_lang_reflect_Proxy.cc
diff --git a/src/java_util_concurrent_atomic_AtomicLong.cc b/src/native/java_util_concurrent_atomic_AtomicLong.cc
index 118b9e40ed..118b9e40ed 100644
--- a/src/java_util_concurrent_atomic_AtomicLong.cc
+++ b/src/native/java_util_concurrent_atomic_AtomicLong.cc
diff --git a/src/org_apache_harmony_dalvik_ddmc_DdmServer.cc b/src/native/org_apache_harmony_dalvik_ddmc_DdmServer.cc
index ed36590401..ed36590401 100644
--- a/src/org_apache_harmony_dalvik_ddmc_DdmServer.cc
+++ b/src/native/org_apache_harmony_dalvik_ddmc_DdmServer.cc
diff --git a/src/org_apache_harmony_dalvik_ddmc_DdmVmInternal.cc b/src/native/org_apache_harmony_dalvik_ddmc_DdmVmInternal.cc
index 88416af9b2..88416af9b2 100644
--- a/src/org_apache_harmony_dalvik_ddmc_DdmVmInternal.cc
+++ b/src/native/org_apache_harmony_dalvik_ddmc_DdmVmInternal.cc
diff --git a/src/sun_misc_Unsafe.cc b/src/native/sun_misc_Unsafe.cc
index 214771b2a3..214771b2a3 100644
--- a/src/sun_misc_Unsafe.cc
+++ b/src/native/sun_misc_Unsafe.cc