diff --git a/cas/aidl/default/Android.bp b/cas/aidl/default/Android.bp index 9d094e0364..34ecbf2862 100644 --- a/cas/aidl/default/Android.bp +++ b/cas/aidl/default/Android.bp @@ -57,7 +57,6 @@ cc_defaults { shared_libs: [ "libbinder_ndk", "liblog", - "libvndksupport", ], header_libs: ["media_plugin_headers"], } diff --git a/cas/aidl/default/SharedLibrary.cpp b/cas/aidl/default/SharedLibrary.cpp index 6322ff303a..c12d17d0cd 100644 --- a/cas/aidl/default/SharedLibrary.cpp +++ b/cas/aidl/default/SharedLibrary.cpp @@ -19,7 +19,6 @@ #include "SharedLibrary.h" #include #include -#include namespace aidl { namespace android { @@ -27,12 +26,12 @@ namespace hardware { namespace cas { SharedLibrary::SharedLibrary(const String8& path) { - mLibHandle = android_load_sphal_library(path.c_str(), RTLD_NOW); + mLibHandle = dlopen(path.c_str(), RTLD_NOW); } SharedLibrary::~SharedLibrary() { if (mLibHandle != NULL) { - android_unload_sphal_library(mLibHandle); + dlclose(mLibHandle); mLibHandle = NULL; } } diff --git a/cas/aidl/default/manifest.json b/cas/aidl/default/manifest.json index 16b4f6710e..cdcecb2ec0 100644 --- a/cas/aidl/default/manifest.json +++ b/cas/aidl/default/manifest.json @@ -1,9 +1,8 @@ { "name": "com.android.hardware.cas", "version": 1, - // For CAS HAL to open plugins from /vendor/lib, "vendor" namespace should be imported. - // ":sphal" is an alias for the "vendor" namespace in Vendor APEX. + // For CAS HAL to open plugins from /vendor/lib/mediacas "requireNativeLibs": [ - ":sphal" + ":mediacas" ] }