Move JNI methods out of top-level.
Change-Id: Ia9c883ba9a13b205cda7b72024e2939f02583acb
diff --git a/build/Android.common.mk b/build/Android.common.mk
index 541ba55..179d140 100644
--- a/build/Android.common.mk
+++ b/build/Android.common.mk
@@ -109,11 +109,6 @@
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 @@
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 @@
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 @@
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 @@
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
similarity index 100%
rename from src/dalvik_system_DexFile.cc
rename to src/native/dalvik_system_DexFile.cc
diff --git a/src/dalvik_system_VMDebug.cc b/src/native/dalvik_system_VMDebug.cc
similarity index 100%
rename from src/dalvik_system_VMDebug.cc
rename to src/native/dalvik_system_VMDebug.cc
diff --git a/src/dalvik_system_VMRuntime.cc b/src/native/dalvik_system_VMRuntime.cc
similarity index 100%
rename from src/dalvik_system_VMRuntime.cc
rename to src/native/dalvik_system_VMRuntime.cc
diff --git a/src/dalvik_system_VMStack.cc b/src/native/dalvik_system_VMStack.cc
similarity index 100%
rename from src/dalvik_system_VMStack.cc
rename to src/native/dalvik_system_VMStack.cc
diff --git a/src/dalvik_system_Zygote.cc b/src/native/dalvik_system_Zygote.cc
similarity index 100%
rename from src/dalvik_system_Zygote.cc
rename to src/native/dalvik_system_Zygote.cc
diff --git a/src/java_lang_Class.cc b/src/native/java_lang_Class.cc
similarity index 100%
rename from src/java_lang_Class.cc
rename to src/native/java_lang_Class.cc
diff --git a/src/java_lang_Object.cc b/src/native/java_lang_Object.cc
similarity index 100%
rename from src/java_lang_Object.cc
rename to src/native/java_lang_Object.cc
diff --git a/src/java_lang_Runtime.cc b/src/native/java_lang_Runtime.cc
similarity index 100%
rename from src/java_lang_Runtime.cc
rename to src/native/java_lang_Runtime.cc
diff --git a/src/java_lang_String.cc b/src/native/java_lang_String.cc
similarity index 100%
rename from src/java_lang_String.cc
rename to src/native/java_lang_String.cc
diff --git a/src/java_lang_System.cc b/src/native/java_lang_System.cc
similarity index 100%
rename from src/java_lang_System.cc
rename to src/native/java_lang_System.cc
diff --git a/src/java_lang_Thread.cc b/src/native/java_lang_Thread.cc
similarity index 100%
rename from src/java_lang_Thread.cc
rename to src/native/java_lang_Thread.cc
diff --git a/src/java_lang_Throwable.cc b/src/native/java_lang_Throwable.cc
similarity index 100%
rename from src/java_lang_Throwable.cc
rename to src/native/java_lang_Throwable.cc
diff --git a/src/java_lang_VMClassLoader.cc b/src/native/java_lang_VMClassLoader.cc
similarity index 100%
rename from src/java_lang_VMClassLoader.cc
rename to src/native/java_lang_VMClassLoader.cc
diff --git a/src/java_lang_reflect_Array.cc b/src/native/java_lang_reflect_Array.cc
similarity index 100%
rename from src/java_lang_reflect_Array.cc
rename to src/native/java_lang_reflect_Array.cc
diff --git a/src/java_lang_reflect_Constructor.cc b/src/native/java_lang_reflect_Constructor.cc
similarity index 100%
rename from src/java_lang_reflect_Constructor.cc
rename to src/native/java_lang_reflect_Constructor.cc
diff --git a/src/java_lang_reflect_Field.cc b/src/native/java_lang_reflect_Field.cc
similarity index 100%
rename from src/java_lang_reflect_Field.cc
rename to src/native/java_lang_reflect_Field.cc
diff --git a/src/java_lang_reflect_Method.cc b/src/native/java_lang_reflect_Method.cc
similarity index 100%
rename from src/java_lang_reflect_Method.cc
rename to src/native/java_lang_reflect_Method.cc
diff --git a/src/java_lang_reflect_Proxy.cc b/src/native/java_lang_reflect_Proxy.cc
similarity index 100%
rename from src/java_lang_reflect_Proxy.cc
rename to 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
similarity index 100%
rename from src/java_util_concurrent_atomic_AtomicLong.cc
rename to 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
similarity index 100%
rename from src/org_apache_harmony_dalvik_ddmc_DdmServer.cc
rename to 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
similarity index 100%
rename from src/org_apache_harmony_dalvik_ddmc_DdmVmInternal.cc
rename to src/native/org_apache_harmony_dalvik_ddmc_DdmVmInternal.cc
diff --git a/src/sun_misc_Unsafe.cc b/src/native/sun_misc_Unsafe.cc
similarity index 100%
rename from src/sun_misc_Unsafe.cc
rename to src/native/sun_misc_Unsafe.cc