tor-browser

commit 4936b0699c44628163bfd4d93de60ad9c83ada54
parent c4b5eb8ff0a3c8e52b13febd17e65fd55702ec66
Author: Ryan VanderMeulen <rvandermeulen@mozilla.com>
Date:   Sat, 18 Oct 2025 00:53:10 +0000

Bug 1991644 - Remove unneeded builtin_available checks. r=jnicol,media-playback-reviewers,alwu

Differential Revision: https://phabricator.services.mozilla.com/D268893

Diffstat:
M
dom/media/eme/mediadrm/MediaDrmRemoteCDMParent.cpp
 | 
12
+-----------
M
gfx/layers/AndroidHardwareBuffer.cpp
 | 
27
+++++++++++----------------

2 files changed, 12 insertions(+), 27 deletions(-)
diff --git a/dom/media/eme/mediadrm/MediaDrmRemoteCDMParent.cpp b/dom/media/eme/mediadrm/MediaDrmRemoteCDMParent.cpp
@@ -30,17 +30,7 @@ void MediaDrmRemoteCDMParent::InitializeStatics() {
 
   sCbMap = new DrmCallbackMap();
 
-  // The NDK header is wrong for AMediaCodecCryptoInfo_setPattern. It is only
-  // present in 24+, not 21+. As such, we can't rely upon the builtin check,
-  // instead we need to load it manually.
-  // See https://github.com/android/ndk/issues/2169
-  void* lib = dlopen("libmediandk.so", RTLD_NOW);
-  sAMediaCodecCryptoInfo_setPattern =
-      (AMediaCodecCryptoInfoFnPtr_setPattern)dlsym(
-          lib, "AMediaCodecCryptoInfo_setPattern");
-  if (__builtin_available(android 24, *)) {
-    MOZ_ASSERT(sAMediaCodecCryptoInfo_setPattern);
-  }
+  MOZ_ASSERT(sAMediaCodecCryptoInfo_setPattern);
 }
 
 /* static */
diff --git a/gfx/layers/AndroidHardwareBuffer.cpp b/gfx/layers/AndroidHardwareBuffer.cpp
@@ -53,22 +53,17 @@ void AndroidHardwareBufferApi::Shutdown() { sInstance = nullptr; }
 AndroidHardwareBufferApi::AndroidHardwareBufferApi() {}
 
 bool AndroidHardwareBufferApi::Load() {
-  if (__builtin_available(android 26, *)) {
-    mAHardwareBuffer_allocate = AHardwareBuffer_allocate;  // API 26
-    mAHardwareBuffer_acquire = AHardwareBuffer_acquire;    // API 26
-    mAHardwareBuffer_release = AHardwareBuffer_release;    // API 26
-    mAHardwareBuffer_describe = AHardwareBuffer_describe;  // API 26
-    mAHardwareBuffer_lock = AHardwareBuffer_lock;          // API 26
-    mAHardwareBuffer_unlock = AHardwareBuffer_unlock;      // API 26
-    mAHardwareBuffer_sendHandleToUnixSocket =
-        AHardwareBuffer_sendHandleToUnixSocket;  // API 26
-    mAHardwareBuffer_recvHandleFromUnixSocket =
-        AHardwareBuffer_recvHandleFromUnixSocket;  // API 26
-    return true;
-  } else {
-    gfxCriticalNote << "Failed to load AHardwareBuffer";
-    return false;
-  }
+  mAHardwareBuffer_allocate = AHardwareBuffer_allocate;
+  mAHardwareBuffer_acquire = AHardwareBuffer_acquire;
+  mAHardwareBuffer_release = AHardwareBuffer_release;
+  mAHardwareBuffer_describe = AHardwareBuffer_describe;
+  mAHardwareBuffer_lock = AHardwareBuffer_lock;
+  mAHardwareBuffer_unlock = AHardwareBuffer_unlock;
+  mAHardwareBuffer_sendHandleToUnixSocket =
+      AHardwareBuffer_sendHandleToUnixSocket;
+  mAHardwareBuffer_recvHandleFromUnixSocket =
+      AHardwareBuffer_recvHandleFromUnixSocket;
+  return true;
 }
 
 void AndroidHardwareBufferApi::Allocate(const AHardwareBuffer_Desc* aDesc,