Make sure native library loads use correct class loader

Merge of #9934 #minor-release PiperOrigin-RevId: 429259055
google · Feb 17, 2022 · 6310406 · 6310406
1 parent 5b8c4e0
commit 6310406
Show file tree

Hide file tree

Showing 7 changed files with 59 additions and 8 deletions.
diff --git a/extensions/av1/src/main/java/com/google/android/exoplayer2/ext/av1/Gav1Library.java b/extensions/av1/src/main/java/com/google/android/exoplayer2/ext/av1/Gav1Library.java
@@ -25,7 +25,13 @@ public final class Gav1Library {
     ExoPlayerLibraryInfo.registerModule("goog.exo.gav1");
   }
 
-  private static final LibraryLoader LOADER = new LibraryLoader("gav1JNI");
+  private static final LibraryLoader LOADER =
+      new LibraryLoader("gav1JNI") {
+        @Override
+        protected void loadLibrary(String name) {
+          System.loadLibrary(name);
+        }
+      };
 
   private Gav1Library() {}
 

diff --git a/extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegLibrary.java b/extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegLibrary.java
@@ -32,7 +32,13 @@ public final class FfmpegLibrary {
 
   private static final String TAG = "FfmpegLibrary";
 
-  private static final LibraryLoader LOADER = new LibraryLoader("ffmpegJNI");
+  private static final LibraryLoader LOADER =
+      new LibraryLoader("ffmpegJNI") {
+        @Override
+        protected void loadLibrary(String name) {
+          System.loadLibrary(name);
+        }
+      };
 
   private static @MonotonicNonNull String version;
   private static int inputBufferPaddingSize = C.LENGTH_UNSET;

diff --git a/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacLibrary.java b/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacLibrary.java
@@ -25,7 +25,13 @@ public final class FlacLibrary {
     ExoPlayerLibraryInfo.registerModule("goog.exo.flac");
   }
 
-  private static final LibraryLoader LOADER = new LibraryLoader("flacJNI");
+  private static final LibraryLoader LOADER =
+      new LibraryLoader("flacJNI") {
+        @Override
+        protected void loadLibrary(String name) {
+          System.loadLibrary(name);
+        }
+      };
 
   private FlacLibrary() {}
 

diff --git a/extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/OpusLibrary.java b/extensions/opus/src/main/java/com/google/android/exoplayer2/ext/opus/OpusLibrary.java
@@ -27,7 +27,14 @@ public final class OpusLibrary {
     ExoPlayerLibraryInfo.registerModule("goog.exo.opus");
   }
 
-  private static final LibraryLoader LOADER = new LibraryLoader("opusV2JNI");
+  private static final LibraryLoader LOADER =
+      new LibraryLoader("opusV2JNI") {
+        @Override
+        protected void loadLibrary(String name) {
+          System.loadLibrary(name);
+        }
+      };
+
   private static @C.CryptoType int cryptoType = C.CRYPTO_TYPE_UNSUPPORTED;
 
   private OpusLibrary() {}

diff --git a/extensions/opus/src/test/java/com/google/android/exoplayer2/ext/opus/OpusDecoderTest.java b/extensions/opus/src/test/java/com/google/android/exoplayer2/ext/opus/OpusDecoderTest.java
@@ -34,7 +34,13 @@
 @RunWith(AndroidJUnit4.class)
 public final class OpusDecoderTest {
 
-  private static final LibraryLoader LOADER = new LibraryLoader("opusV2JNI");
+  private static final LibraryLoader LOADER =
+      new LibraryLoader("opusV2JNI") {
+        @Override
+        protected void loadLibrary(String name) {
+          System.loadLibrary(name);
+        }
+      };
 
   private static final byte[] HEADER =
       new byte[] {79, 112, 117, 115, 72, 101, 97, 100, 0, 2, 1, 56, 0, 0, -69, -128, 0, 0, 0};

diff --git a/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxLibrary.java b/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxLibrary.java
@@ -27,7 +27,14 @@ public final class VpxLibrary {
     ExoPlayerLibraryInfo.registerModule("goog.exo.vpx");
   }
 
-  private static final LibraryLoader LOADER = new LibraryLoader("vpx", "vpxV2JNI");
+  private static final LibraryLoader LOADER =
+      new LibraryLoader("vpx", "vpxV2JNI") {
+        @Override
+        protected void loadLibrary(String name) {
+          System.loadLibrary(name);
+        }
+      };
+
   private static @C.CryptoType int cryptoType = C.CRYPTO_TYPE_UNSUPPORTED;
 
   private VpxLibrary() {}

diff --git a/library/common/src/main/java/com/google/android/exoplayer2/util/LibraryLoader.java b/library/common/src/main/java/com/google/android/exoplayer2/util/LibraryLoader.java
@@ -18,7 +18,7 @@
 import java.util.Arrays;
 
 /** Configurable loader for native libraries. */
-public final class LibraryLoader {
+public abstract class LibraryLoader {
 
   private static final String TAG = "LibraryLoader";
 
@@ -48,7 +48,7 @@ public synchronized boolean isAvailable() {
     loadAttempted = true;
     try {
       for (String lib : nativeLibraries) {
-        System.loadLibrary(lib);
+        loadLibrary(lib);
       }
       isAvailable = true;
     } catch (UnsatisfiedLinkError exception) {
@@ -58,4 +58,17 @@ public synchronized boolean isAvailable() {
     }
     return isAvailable;
   }
+
+  /**
+   * Should be implemented to call {@code System.loadLibrary(name)}.
+   *
+   * <p>It's necessary for each subclass to implement this method because {@link
+   * System#loadLibrary(String)} uses reflection to obtain the calling class, which is then used to
+   * obtain the class loader to use when loading the native library. If this class were to implement
+   * the method directly, and if a subclass were to have a different class loader, then loading of
+   * the native library would fail.
+   *
+   * @param name The name of the library to load.
+   */
+  protected abstract void loadLibrary(String name);
 }