commit 5a3d5884427541ef673d003f7fbe4f6f157b92be
author Jooyung Han <jooyung@google.com> Thu Sep 14 13:31:43 2023 +0000
committer Jooyung Han <jooyung@google.com> Fri Sep 15 00:17:30 2023 +0900
tree fc16f7bfd0eefb960589bfcb297284a889c216ba
parent 38a85e778c7e4516dde14840ab69692e671c5af5

Revert^2 "Add CAS HAL APEX"

8b19286ce39adec54b7716e522e4efc5c5b3f455

This relands the CAS HAL APEX.

Bug: 297467514
Test: atest CtsMediaMiscTestCases:MediaCasTest
Change-Id: I741d059688ac65f42bed45e068cd00ccc5d631f5

cas/aidl/default/SharedLibrary.cpp

diff --git a/cas/aidl/default/SharedLibrary.cpp b/cas/aidl/default/SharedLibrary.cpp
index c12d17d..6322ff3 100644
--- a/cas/aidl/default/SharedLibrary.cpp
+++ b/cas/aidl/default/SharedLibrary.cpp
@@ -19,6 +19,7 @@
 #include "SharedLibrary.h"
 #include <dlfcn.h>
 #include <utils/Log.h>
+#include <vndksupport/linker.h>
 
 namespace aidl {
 namespace android {
@@ -26,12 +27,12 @@
 namespace cas {
 
 SharedLibrary::SharedLibrary(const String8& path) {
-    mLibHandle = dlopen(path.c_str(), RTLD_NOW);
+    mLibHandle = android_load_sphal_library(path.c_str(), RTLD_NOW);
 }
 
 SharedLibrary::~SharedLibrary() {
     if (mLibHandle != NULL) {
-        dlclose(mLibHandle);
+        android_unload_sphal_library(mLibHandle);
         mLibHandle = NULL;
     }
 }