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

Commit ef280831 authored by Jooyung Han's avatar Jooyung Han
Browse files

Use libandroid_runtime lazily 

This is a part of cutting dependency from libmediandk to
libandroid_runtime.

By making a libandroid_runtime to be loaded lazily,
libmediandk won't load libandroid_runtime when it is used as a LL-NDK.

Bug: 124268753
Test: m -j
Change-Id: Ib040856c58d38e11a5f32cd5dd5519910573334b
Merged-In: Ib040856c58d38e11a5f32cd5dd5519910573334b
parent 7e7836e3

media/ndk/Android.bp

+6 −1
Original line number Diff line number Diff line
@@ -77,12 +77,17 @@ cc_library_shared { 
        "libutils",

        "libcutils",

        "libnativewindow",

        "libandroid_runtime",

        "libbinder",

        "libgui",

        "libui",

    ],



    required: [

        // libmediandk may be used by Java and non-Java things. When lower-level things use it,

        // they shouldn't have to take on the cost of loading libandroid_runtime.

        "libandroid_runtime",

    ],



    export_include_dirs: ["include"],



    product_variables: {

media/ndk/NdkImageReader.cpp

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
#include <cutils/atomic.h>

#include <utils/Log.h>

#include <android_media_Utils.h>

#include <android_runtime/android_view_Surface.h>

#include <ui/PublicFormat.h>

#include <private/android/AHardwareBufferHelpers.h>

#include <grallocusage/GrallocUsageConversion.h>

media/ndk/NdkMediaCrypto.cpp

+0 −1
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ 
#include <binder/IServiceManager.h>

#include <media/ICrypto.h>

#include <media/IMediaDrmService.h>

#include <android_runtime/AndroidRuntime.h>

#include <android_util_Binder.h>



#include <jni.h>

media/ndk/NdkMediaExtractor.cpp

+60 −3
Original line number Diff line number Diff line
@@ -33,13 +33,70 @@ 
#include <media/stagefright/MetaData.h>

#include <media/stagefright/NuMediaExtractor.h>

#include <media/IMediaHTTPService.h>

#include <android_runtime/AndroidRuntime.h>

#include <android_util_Binder.h>



#include <jni.h>



#include <mutex> // std::call_once,once_flag

#include <dlfcn.h> // dlopen



using namespace android;



// load libandroid_runtime.so lazily.

// A vendor process may use libmediandk but should not depend on libandroid_runtime.

// TODO(jooyung): remove duplicate (b/125550121)

// frameworks/native/libs/binder/ndk/ibinder_jni.cpp

namespace {



typedef JNIEnv* (*getJNIEnv_t)();

typedef sp<IBinder> (*ibinderForJavaObject_t)(JNIEnv* env, jobject obj);



getJNIEnv_t getJNIEnv_;

ibinderForJavaObject_t ibinderForJavaObject_;



std::once_flag mLoadFlag;



void load() {

    std::call_once(mLoadFlag, []() {

        void* handle = dlopen("libandroid_runtime.so", RTLD_LAZY);

        if (handle == nullptr) {

            ALOGE("Could not open libandroid_runtime.");

            return;

        }



        getJNIEnv_ = reinterpret_cast<getJNIEnv_t>(

                dlsym(handle, "_ZN7android14AndroidRuntime9getJNIEnvEv"));

        if (getJNIEnv_ == nullptr) {

            ALOGE("Could not find AndroidRuntime::getJNIEnv.");

            // no return

        }



        ibinderForJavaObject_ = reinterpret_cast<ibinderForJavaObject_t>(

                dlsym(handle, "_ZN7android20ibinderForJavaObjectEP7_JNIEnvP8_jobject"));

        if (ibinderForJavaObject_ == nullptr) {

            ALOGE("Could not find ibinderForJavaObject.");

            // no return

        }

    });

}



JNIEnv* getJNIEnv() {

    load();

    if (getJNIEnv_ == nullptr) {

        return nullptr;

    }

    return (getJNIEnv_)();

}



sp<IBinder> ibinderForJavaObject(JNIEnv* env, jobject obj) {

    load();

    if (ibinderForJavaObject_ == nullptr) {

        return nullptr;

    }

    return (ibinderForJavaObject_)(env, obj);

}



} // namespace



static media_status_t translate_error(status_t err) {

    if (err == OK) {

        return AMEDIA_OK;
@@ -87,7 +144,7 @@ media_status_t AMediaExtractor_setDataSource(AMediaExtractor *mData, const char 
    ALOGV("setDataSource(%s)", location);

    // TODO: add header support



    JNIEnv *env = AndroidRuntime::getJNIEnv();

    JNIEnv *env = getJNIEnv();

    jobject service = NULL;

    if (env == NULL) {

        ALOGE("setDataSource(path) must be called from Java thread");

media/ndk/NdkMediaFormat.cpp

+0 −1
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ 
#include <utils/StrongPointer.h>

#include <media/stagefright/foundation/ABuffer.h>

#include <media/stagefright/foundation/AMessage.h>

#include <android_runtime/AndroidRuntime.h>

#include <android_util_Binder.h>



#include <jni.h>