diff options
| author | Elliott Hughes <enh@google.com> | 2013-07-23 16:17:22 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2013-07-23 16:17:22 -0700 |
| commit | ee817c75a2afbdf3d6ce05b4bf0326215135025c (patch) | |
| tree | 751003cdb40b2dcab01fe29b0ce47d6b35e58333 /vm/Globals.h | |
| parent | bc03380a9d5565cdef0c4b4c41fdd19813b05799 (diff) | |
| download | android_dalvik-ee817c75a2afbdf3d6ce05b4bf0326215135025c.tar.gz android_dalvik-ee817c75a2afbdf3d6ce05b4bf0326215135025c.tar.bz2 android_dalvik-ee817c75a2afbdf3d6ce05b4bf0326215135025c.zip | |
Simplify merges of the annotation code.
Change-Id: I9fd3b53032b2e6053094500571775ed2fb5edf78
Diffstat (limited to 'vm/Globals.h')
| -rw-r--r-- | vm/Globals.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vm/Globals.h b/vm/Globals.h index 1c0cb8cef..d4076e992 100644 --- a/vm/Globals.h +++ b/vm/Globals.h @@ -268,9 +268,9 @@ struct DvmGlobals { ClassObject* classJavaLangReflectMethodArray; ClassObject* classJavaLangReflectProxy; ClassObject* classJavaNioDirectByteBuffer; - ClassObject* classOrgApacheHarmonyLangAnnotationAnnotationFactory; - ClassObject* classOrgApacheHarmonyLangAnnotationAnnotationMember; - ClassObject* classOrgApacheHarmonyLangAnnotationAnnotationMemberArray; + ClassObject* classLibcoreReflectAnnotationFactory; + ClassObject* classLibcoreReflectAnnotationMember; + ClassObject* classLibcoreReflectAnnotationMemberArray; ClassObject* classOrgApacheHarmonyDalvikDdmcChunk; ClassObject* classOrgApacheHarmonyDalvikDdmcDdmServer; ClassObject* classJavaLangRefFinalizerReference; |