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

Commit 5de17859 authored by Jooyung Han's avatar Jooyung Han Committed by Gerrit Code Review
Browse files

Merge "Use explicit requirements from APEX" into main

parents abb7c878 9e73b204

cas/aidl/default/Android.bp

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

    shared_libs: [

        "libbinder_ndk",

        "libbinder_ndk",

        "liblog",

        "liblog",

        "libvndksupport",

    ],

    ],

    header_libs: ["media_plugin_headers"],

    header_libs: ["media_plugin_headers"],

}

}

cas/aidl/default/SharedLibrary.cpp

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

#include "SharedLibrary.h"

#include <dlfcn.h>

#include <dlfcn.h>

#include <utils/Log.h>

#include <utils/Log.h>

#include <vndksupport/linker.h>





namespace aidl {

namespace aidl {

namespace android {

namespace android {
@@ -27,12 +26,12 @@ namespace hardware { 
namespace cas {

namespace cas {





SharedLibrary::SharedLibrary(const String8& path) {

SharedLibrary::SharedLibrary(const String8& path) {

    mLibHandle = android_load_sphal_library(path.c_str(), RTLD_NOW);

    mLibHandle = dlopen(path.c_str(), RTLD_NOW);

}

}





SharedLibrary::~SharedLibrary() {

SharedLibrary::~SharedLibrary() {

    if (mLibHandle != NULL) {

    if (mLibHandle != NULL) {

        android_unload_sphal_library(mLibHandle);

        dlclose(mLibHandle);

        mLibHandle = NULL;

        mLibHandle = NULL;

    }

    }

}

}

cas/aidl/default/manifest.json

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

{

    "name": "com.android.hardware.cas",

    "name": "com.android.hardware.cas",

    "version": 1,

    "version": 1,

    // For CAS HAL to open plugins from /vendor/lib, "vendor" namespace should be imported.

    // For CAS HAL to open plugins from /vendor/lib/mediacas

    // ":sphal" is an alias for the "vendor" namespace in Vendor APEX.

    "requireNativeLibs": [

    "requireNativeLibs": [

        ":sphal"

        ":mediacas"

    ]

    ]

}
 
}