summaryrefslogtreecommitdiffstats
path: root/vm/Init.c
diff options
context:
space:
mode:
authorDan Bornstein <danfuzz@android.com>2011-03-02 15:08:54 -0800
committerDan Bornstein <danfuzz@android.com>2011-03-02 15:08:54 -0800
commit4b5fa2e50860015beebcc5fc3a33265b266d6d34 (patch)
tree04ff103cbbf20473a89ef2ad247b10ecc4cd0615 /vm/Init.c
parent8521311b4e55847c650a87933d5a3f04618e4e69 (diff)
downloadandroid_dalvik-4b5fa2e50860015beebcc5fc3a33265b266d6d34.tar.gz
android_dalvik-4b5fa2e50860015beebcc5fc3a33265b266d6d34.tar.bz2
android_dalvik-4b5fa2e50860015beebcc5fc3a33265b266d6d34.zip
Clarify the ordering requirement.
Hopefully, future maintainers won't also have to spend a day or so sorting out what's going on. Bug: 3500987 Change-Id: I0a1041df9ed4992563bc9d882fa134e82829cf18
Diffstat (limited to 'vm/Init.c')
-rw-r--r--vm/Init.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/vm/Init.c b/vm/Init.c
index 7f72040d7..52f08da0a 100644
--- a/vm/Init.c
+++ b/vm/Init.c
@@ -1178,7 +1178,7 @@ static bool initRef(ClassObject** pClass, const char* name)
}
/* (documented in header) */
-int dvmInitRequiredClassesAndMembers(void) {
+int dvmFindRequiredClassesAndMembers(void) {
/*
* Note: Under normal VM use, this is called by dvmStartup()
* below. For dex optimization, this is called as well, but in
@@ -1393,7 +1393,7 @@ int dvmStartup(int argc, const char* const argv[], bool ignoreUnrecognized,
* call populates the gDvm instance with all the class and member
* references that the VM wants to use directly.
*/
- if (!dvmInitRequiredClassesAndMembers())
+ if (!dvmFindRequiredClassesAndMembers())
goto fail;
if (!dvmBaseClassStartup())