summaryrefslogtreecommitdiffstats
path: root/runtime/runtime.cc
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2014-04-02 10:29:49 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-04-02 10:29:50 +0000
commit8e157dc9e2938aa7eeadaf4ea34e8d3e727136bc (patch)
tree295c380a2a9b2c57851fb60576abf5661ecad237 /runtime/runtime.cc
parent5120686d956cdea3f4b662941f361e0867a4bbad (diff)
parent8b2c8b9642d5fe037f93ab0cb6a5065e2a192e40 (diff)
downloadart-8e157dc9e2938aa7eeadaf4ea34e8d3e727136bc.zip
art-8e157dc9e2938aa7eeadaf4ea34e8d3e727136bc.tar.gz
art-8e157dc9e2938aa7eeadaf4ea34e8d3e727136bc.tar.bz2
Merge "Move most zygote related code to frameworks/base."
Diffstat (limited to 'runtime/runtime.cc')
-rw-r--r--runtime/runtime.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/runtime.cc b/runtime/runtime.cc
index 23405e6..a830018 100644
--- a/runtime/runtime.cc
+++ b/runtime/runtime.cc
@@ -708,7 +708,7 @@ void Runtime::RegisterRuntimeNativeMethods(JNIEnv* env) {
REGISTER(register_dalvik_system_VMDebug);
REGISTER(register_dalvik_system_VMRuntime);
REGISTER(register_dalvik_system_VMStack);
- REGISTER(register_dalvik_system_Zygote);
+ REGISTER(register_dalvik_system_ZygoteHooks);
REGISTER(register_java_lang_Class);
REGISTER(register_java_lang_DexCache);
REGISTER(register_java_lang_Object);