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

Commit 31951657 authored by Chong Zhang's avatar Chong Zhang Committed by android-build-merger
Browse files

Merge "MediaCas: move clear key plugin to /system/lib" into oc-dev 

am: ad202407

Change-Id: I78a7103facb44a837e3dd9d6cc833bb0e31d19d7
parents e4d38be6 ad202407

drm/mediacas/plugins/clearkey/Android.mk

+2 −1
Original line number Diff line number Diff line
@@ -28,7 +28,8 @@ LOCAL_SRC_FILES:= \ 


LOCAL_MODULE := libclearkeycasplugin



LOCAL_PROPRIETARY_MODULE := true

#TODO: move this back to /vendor/lib after conversion to treble

#LOCAL_PROPRIETARY_MODULE := true

LOCAL_MODULE_RELATIVE_PATH := mediacas



LOCAL_SHARED_LIBRARIES := \

drm/mediacas/plugins/clearkey/tests/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ LOCAL_MODULE := ClearKeyFetcherTest 
# the plugin is not in standard library search path. Without this .so

# loading fails at run-time (linking is okay).

LOCAL_LDFLAGS := \

    -Wl,--rpath,\$${ORIGIN}/../../../system/vendor/lib/mediacas -Wl,--enable-new-dtags

    -Wl,--rpath,\$${ORIGIN}/../../../system/lib/mediacas -Wl,--enable-new-dtags



LOCAL_SHARED_LIBRARIES := \

    libutils libclearkeycasplugin libstagefright_foundation libprotobuf-cpp-lite liblog

services/mediadrm/FactoryLoader.h

+2 −2
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ bool FactoryLoader<T>::findFactoryForScheme( 
    }



    // no luck, have to search

    String8 dirPath("/vendor/lib/mediacas");

    String8 dirPath("/system/lib/mediacas");

    DIR* pDir = opendir(dirPath.string());



    if (pDir == NULL) {
@@ -123,7 +123,7 @@ bool FactoryLoader<T>::enumeratePlugins( 


    results->clear();



    String8 dirPath("/vendor/lib/mediacas");

    String8 dirPath("/system/lib/mediacas");

    DIR* pDir = opendir(dirPath.string());



    if (pDir == NULL) {