Merge "Move some files with dalvik dependencies to libdvm"

30 files changed, 3 insertions, 0 deletions

diff --git a/Docs.mk b/Docs.mk
index 875a008..48cfd03 100644
--- a/Docs.mk
+++ b/Docs.mk
@@ -21,6 +21,8 @@ define libcore_to_document
    dalvik/src/main/java/dalvik/annotation \
    dalvik/src/main/java/dalvik/bytecode \
    json/src/main/java \
+   libdvm/src/main/java/dalvik \
+   libdvm/src/main/java/java \
    luni/src/main/java/java \
    luni/src/main/java/javax \
    luni/src/main/java/org/xml/sax \
diff --git a/JavaLibrary.mk b/JavaLibrary.mk
index 16e26e9..a28e609 100644
--- a/JavaLibrary.mk
+++ b/JavaLibrary.mk
@@ -51,6 +51,7 @@ endef
 
 # The Java files and their associated resources.
 core_src_files := $(call all-main-java-files-under,dalvik dex dom json luni support xml)
+core_src_files += $(call all-main-java-files-under,libdvm)
 core_resource_dirs := $(call all-core-resource-dirs,main)
 test_resource_dirs := $(call all-core-resource-dirs,test)
 
diff --git a/dalvik/src/main/java/dalvik/system/BaseDexClassLoader.java b/libdvm/src/main/java/dalvik/system/BaseDexClassLoader.java
index d3ec95a..d3ec95a 100644
--- a/dalvik/src/main/java/dalvik/system/BaseDexClassLoader.java
+++ b/libdvm/src/main/java/dalvik/system/BaseDexClassLoader.java
diff --git a/dalvik/src/main/java/dalvik/system/DexFile.java b/libdvm/src/main/java/dalvik/system/DexFile.java
index 18b730b..18b730b 100644
--- a/dalvik/src/main/java/dalvik/system/DexFile.java
+++ b/libdvm/src/main/java/dalvik/system/DexFile.java
diff --git a/dalvik/src/main/java/dalvik/system/DexPathList.java b/libdvm/src/main/java/dalvik/system/DexPathList.java
index 3d9ee3e..3d9ee3e 100644
--- a/dalvik/src/main/java/dalvik/system/DexPathList.java
+++ b/libdvm/src/main/java/dalvik/system/DexPathList.java
diff --git a/luni/src/main/java/java/lang/Class.java b/libdvm/src/main/java/java/lang/Class.java
index f618b66..f618b66 100644
--- a/luni/src/main/java/java/lang/Class.java
+++ b/libdvm/src/main/java/java/lang/Class.java
diff --git a/luni/src/main/java/java/lang/ClassLoader.java b/libdvm/src/main/java/java/lang/ClassLoader.java
index dbad137..dbad137 100644
--- a/luni/src/main/java/java/lang/ClassLoader.java
+++ b/libdvm/src/main/java/java/lang/ClassLoader.java
diff --git a/luni/src/main/java/java/lang/Daemons.java b/libdvm/src/main/java/java/lang/Daemons.java
index 78a4152..78a4152 100644
--- a/luni/src/main/java/java/lang/Daemons.java
+++ b/libdvm/src/main/java/java/lang/Daemons.java
diff --git a/luni/src/main/java/java/lang/Object.java b/libdvm/src/main/java/java/lang/Object.java
index 4bca034..4bca034 100644
--- a/luni/src/main/java/java/lang/Object.java
+++ b/libdvm/src/main/java/java/lang/Object.java
diff --git a/luni/src/main/java/java/lang/Thread.java b/libdvm/src/main/java/java/lang/Thread.java
index cc0975f..cc0975f 100644
--- a/luni/src/main/java/java/lang/Thread.java
+++ b/libdvm/src/main/java/java/lang/Thread.java
diff --git a/luni/src/main/java/java/lang/ThreadGroup.java b/libdvm/src/main/java/java/lang/ThreadGroup.java
index e99e99f..e99e99f 100644
--- a/luni/src/main/java/java/lang/ThreadGroup.java
+++ b/libdvm/src/main/java/java/lang/ThreadGroup.java
diff --git a/luni/src/main/java/java/lang/VMClassLoader.java b/libdvm/src/main/java/java/lang/VMClassLoader.java
index d7162c6..d7162c6 100644
--- a/luni/src/main/java/java/lang/VMClassLoader.java
+++ b/libdvm/src/main/java/java/lang/VMClassLoader.java
diff --git a/luni/src/main/java/java/lang/VMThread.java b/libdvm/src/main/java/java/lang/VMThread.java
index 01f6ee3..01f6ee3 100644
--- a/luni/src/main/java/java/lang/VMThread.java
+++ b/libdvm/src/main/java/java/lang/VMThread.java
diff --git a/luni/src/main/java/java/lang/reflect/AccessibleObject.java b/libdvm/src/main/java/java/lang/reflect/AccessibleObject.java
index 9c6b8c7..9c6b8c7 100644
--- a/luni/src/main/java/java/lang/reflect/AccessibleObject.java
+++ b/libdvm/src/main/java/java/lang/reflect/AccessibleObject.java
diff --git a/luni/src/main/java/java/lang/reflect/Constructor.java b/libdvm/src/main/java/java/lang/reflect/Constructor.java
index 9a0e03c..9a0e03c 100644
--- a/luni/src/main/java/java/lang/reflect/Constructor.java
+++ b/libdvm/src/main/java/java/lang/reflect/Constructor.java
diff --git a/luni/src/main/java/java/lang/reflect/Field.java b/libdvm/src/main/java/java/lang/reflect/Field.java
index 0aacb11..0aacb11 100644
--- a/luni/src/main/java/java/lang/reflect/Field.java
+++ b/libdvm/src/main/java/java/lang/reflect/Field.java
diff --git a/luni/src/main/java/java/lang/reflect/Method.java b/libdvm/src/main/java/java/lang/reflect/Method.java
index b2f970a..b2f970a 100644
--- a/luni/src/main/java/java/lang/reflect/Method.java
+++ b/libdvm/src/main/java/java/lang/reflect/Method.java
diff --git a/luni/src/main/java/java/lang/reflect/Proxy.java b/libdvm/src/main/java/java/lang/reflect/Proxy.java
index 3b10887..3b10887 100644
--- a/luni/src/main/java/java/lang/reflect/Proxy.java
+++ b/libdvm/src/main/java/java/lang/reflect/Proxy.java
diff --git a/luni/src/main/java/org/apache/harmony/kernel/vm/StringUtils.java b/libdvm/src/main/java/org/apache/harmony/kernel/vm/StringUtils.java
index 01d0e30..01d0e30 100644
--- a/luni/src/main/java/org/apache/harmony/kernel/vm/StringUtils.java
+++ b/libdvm/src/main/java/org/apache/harmony/kernel/vm/StringUtils.java
diff --git a/luni/src/main/java/org/apache/harmony/lang/annotation/AnnotationFactory.java b/libdvm/src/main/java/org/apache/harmony/lang/annotation/AnnotationFactory.java
index 3fd13f5..3fd13f5 100644
--- a/luni/src/main/java/org/apache/harmony/lang/annotation/AnnotationFactory.java
+++ b/libdvm/src/main/java/org/apache/harmony/lang/annotation/AnnotationFactory.java
diff --git a/luni/src/main/java/org/apache/harmony/lang/annotation/AnnotationMember.java b/libdvm/src/main/java/org/apache/harmony/lang/annotation/AnnotationMember.java
index f64332a..f64332a 100644
--- a/luni/src/main/java/org/apache/harmony/lang/annotation/AnnotationMember.java
+++ b/libdvm/src/main/java/org/apache/harmony/lang/annotation/AnnotationMember.java
diff --git a/luni/src/main/java/org/apache/harmony/luni/lang/reflect/GenericSignatureParser.java b/libdvm/src/main/java/org/apache/harmony/luni/lang/reflect/GenericSignatureParser.java
index 490daaf..490daaf 100644
--- a/luni/src/main/java/org/apache/harmony/luni/lang/reflect/GenericSignatureParser.java
+++ b/libdvm/src/main/java/org/apache/harmony/luni/lang/reflect/GenericSignatureParser.java
diff --git a/luni/src/main/java/org/apache/harmony/luni/lang/reflect/ImplForArray.java b/libdvm/src/main/java/org/apache/harmony/luni/lang/reflect/ImplForArray.java
index c9b76b1..c9b76b1 100644
--- a/luni/src/main/java/org/apache/harmony/luni/lang/reflect/ImplForArray.java
+++ b/libdvm/src/main/java/org/apache/harmony/luni/lang/reflect/ImplForArray.java
diff --git a/luni/src/main/java/org/apache/harmony/luni/lang/reflect/ImplForType.java b/libdvm/src/main/java/org/apache/harmony/luni/lang/reflect/ImplForType.java
index b1f05d4..b1f05d4 100644
--- a/luni/src/main/java/org/apache/harmony/luni/lang/reflect/ImplForType.java
+++ b/libdvm/src/main/java/org/apache/harmony/luni/lang/reflect/ImplForType.java
diff --git a/luni/src/main/java/org/apache/harmony/luni/lang/reflect/ImplForVariable.java b/libdvm/src/main/java/org/apache/harmony/luni/lang/reflect/ImplForVariable.java
index 783d223..783d223 100644
--- a/luni/src/main/java/org/apache/harmony/luni/lang/reflect/ImplForVariable.java
+++ b/libdvm/src/main/java/org/apache/harmony/luni/lang/reflect/ImplForVariable.java
diff --git a/luni/src/main/java/org/apache/harmony/luni/lang/reflect/ImplForWildcard.java b/libdvm/src/main/java/org/apache/harmony/luni/lang/reflect/ImplForWildcard.java
index b0605f2..b0605f2 100644
--- a/luni/src/main/java/org/apache/harmony/luni/lang/reflect/ImplForWildcard.java
+++ b/libdvm/src/main/java/org/apache/harmony/luni/lang/reflect/ImplForWildcard.java
diff --git a/luni/src/main/java/org/apache/harmony/luni/lang/reflect/ListOfTypes.java b/libdvm/src/main/java/org/apache/harmony/luni/lang/reflect/ListOfTypes.java
index 59470f5..59470f5 100644
--- a/luni/src/main/java/org/apache/harmony/luni/lang/reflect/ListOfTypes.java
+++ b/libdvm/src/main/java/org/apache/harmony/luni/lang/reflect/ListOfTypes.java
diff --git a/luni/src/main/java/org/apache/harmony/luni/lang/reflect/ListOfVariables.java b/libdvm/src/main/java/org/apache/harmony/luni/lang/reflect/ListOfVariables.java
index 0e757ac..0e757ac 100644
--- a/luni/src/main/java/org/apache/harmony/luni/lang/reflect/ListOfVariables.java
+++ b/libdvm/src/main/java/org/apache/harmony/luni/lang/reflect/ListOfVariables.java
diff --git a/luni/src/main/java/org/apache/harmony/luni/lang/reflect/Types.java b/libdvm/src/main/java/org/apache/harmony/luni/lang/reflect/Types.java
index bd700fc..bd700fc 100644
--- a/luni/src/main/java/org/apache/harmony/luni/lang/reflect/Types.java
+++ b/libdvm/src/main/java/org/apache/harmony/luni/lang/reflect/Types.java
diff --git a/luni/src/main/java/sun/misc/Unsafe.java b/libdvm/src/main/java/sun/misc/Unsafe.java
index 884340b..884340b 100644
--- a/luni/src/main/java/sun/misc/Unsafe.java
+++ b/libdvm/src/main/java/sun/misc/Unsafe.java