Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fc146cc1 authored by Jooyung Han's avatar Jooyung Han Committed by Automerger Merge Worker
Browse files

Merge "Use explicit requirements from APEX" into main am: 5de17859 

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2785639



Change-Id: I69c3df91f2cf6dc8637c3a5833360db89eaf2300
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b5d5cd67 5de17859

cas/aidl/default/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -57,7 +57,6 @@ cc_defaults { 
    shared_libs: [

        "libbinder_ndk",

        "liblog",

        "libvndksupport",

    ],

    header_libs: ["media_plugin_headers"],

}

cas/aidl/default/SharedLibrary.cpp

+2 −3
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
#include "SharedLibrary.h"

#include <dlfcn.h>

#include <utils/Log.h>

#include <vndksupport/linker.h>



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;

    }

}

cas/aidl/default/manifest.json

+2 −3
Original line number Diff line number Diff line 
{

    "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"

    ]

}