commit edccd3cc6d0b60bcf87295774b0728fd8755c329
author Orion Hodson <oth@google.com> Fri Mar 13 14:54:27 2020 +0000
committer Orion Hodson <oth@google.com> Mon Mar 16 08:20:30 2020 +0000
tree b0f4ca89c39f12f495beca2deb0110df5f7a66d5
parent 444dc1c77068e56b8fbb9789d74d34101f29bffc

Retire VMRuntime.doNotInitializeInAot()

This was used to delay initialization of UnixChannelFactory.

Bug: 109735195
Bug: 144502743
Test: art/test.py --host --prebuild --64 -r -t 071-dexfile-map-clean
Test: atest PreloadCheck
Change-Id: I51102f1241c1a9bf344c8cfeed9f88c625610763

runtime/native/dalvik_system_VMRuntime.cc

diff --git a/runtime/native/dalvik_system_VMRuntime.cc b/runtime/native/dalvik_system_VMRuntime.cc
index bb3ff11..dbfa2a8 100644
--- a/runtime/native/dalvik_system_VMRuntime.cc
+++ b/runtime/native/dalvik_system_VMRuntime.cc
@@ -668,9 +668,6 @@
   Runtime::Current()->RegisterAppInfo(code_paths_vec, profile_file_str);
 }
 
-static void VMRuntime_doNotInitializeInAot() {
-}
-
 static jboolean VMRuntime_isBootClassPathOnDisk(JNIEnv* env, jclass, jstring java_instruction_set) {
   ScopedUtfChars instruction_set(env, java_instruction_set);
   if (instruction_set.c_str() == nullptr) {
@@ -825,7 +822,6 @@
   FAST_NATIVE_METHOD(VMRuntime, isCheckJniEnabled, "()Z"),
   NATIVE_METHOD(VMRuntime, preloadDexCaches, "()V"),
   NATIVE_METHOD(VMRuntime, registerAppInfo, "(Ljava/lang/String;[Ljava/lang/String;)V"),
-  CRITICAL_NATIVE_METHOD(VMRuntime, doNotInitializeInAot, "()V"),
   NATIVE_METHOD(VMRuntime, isBootClassPathOnDisk, "(Ljava/lang/String;)Z"),
   NATIVE_METHOD(VMRuntime, getCurrentInstructionSet, "()Ljava/lang/String;"),
   NATIVE_METHOD(VMRuntime, didPruneDalvikCache, "()Z"),