Allow UnixChannelFactory initialization during AOT
Previously blocked due to b/109735195, but underlying issues
now resolved.
Bug: 109735195
Bug: 144502743
Test: art/test.py --host --64 --prebuild 071-dexfile-map-cleanup
Test: atest PreloadCheck
Change-Id: I9256da7fffc8f64fae0f5423d7d27d126b5b47dc
diff --git a/libart/src/main/java/dalvik/system/VMRuntime.java b/libart/src/main/java/dalvik/system/VMRuntime.java
index 321f4e3..482464f 100644
--- a/libart/src/main/java/dalvik/system/VMRuntime.java
+++ b/libart/src/main/java/dalvik/system/VMRuntime.java
@@ -674,16 +674,6 @@
}
/**
- * Prevent initialization of the caller's class if they are calling
- * from their clinit method. This works because calling a JNI method
- * from clinit causes the transactional runtime to abort the current
- * transaction.
- * @hide
- */
- @CriticalNative
- public static native void doNotInitializeInAot();
-
- /**
* Return false if the boot class path for the given instruction
* set mapped from disk storage, versus being interpretted from
* dirty pages in memory.
diff --git a/ojluni/src/main/java/sun/nio/fs/UnixChannelFactory.java b/ojluni/src/main/java/sun/nio/fs/UnixChannelFactory.java
index 9491fd9..c6f074e 100644
--- a/ojluni/src/main/java/sun/nio/fs/UnixChannelFactory.java
+++ b/ojluni/src/main/java/sun/nio/fs/UnixChannelFactory.java
@@ -47,13 +47,6 @@
private static final JavaIOFileDescriptorAccess fdAccess =
SharedSecrets.getJavaIOFileDescriptorAccess();
- static {
- // b/151107960. This class is on the preloaded-classes-blacklist.
- // It would be instantiated during AOT now without this magic
- // function call and consequently fail 'atest PreloadCheck'.
- dalvik.system.VMRuntime.doNotInitializeInAot();
- }
-
protected UnixChannelFactory() {
}