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

Commit d429b1f9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes from topic "fix-omx-dependencies" 

* changes:
  Make camera/drm helper classes available to system.
  Remove dependency to libmediadrm from drm HAL
parents 0e06a63c 567cbf11

camera/common/1.0/default/Android.bp

+1 −1
Original line number Diff line number Diff line 
cc_library_static {

    name: "android.hardware.camera.common@1.0-helper",

    vendor: true,

    vendor_available: true,

    defaults: ["hidl_defaults"],

    srcs: [

        "CameraModule.cpp",

drm/1.0/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -92,3 +92,5 @@ cc_library { 
        "libutils",

    ],

}



subdirs = ["default"]

drm/1.0/default/Android.bp

0 → 100644
+23 −0
Original line number Diff line number Diff line 
cc_library_static {

    name: "android.hardware.drm@1.0-helper",

    vendor_available: true,

    defaults: ["hidl_defaults"],

    srcs: [

        "SharedLibrary.cpp",

    ],

    cflags: [

        "-Werror",

        "-Wextra",

        "-Wall",

    ],

    shared_libs: [

        "liblog",

    ],

    header_libs: [

        "libutils_headers",

    ],

    export_header_lib_headers: [

        "libutils_headers",

    ],

    export_include_dirs : ["include"]

}

drm/1.0/default/Android.mk

+6 −1
Original line number Diff line number Diff line
@@ -36,6 +36,9 @@ LOCAL_SHARED_LIBRARIES := \ 
  libutils \

  libbinder \



LOCAL_STATIC_LIBRARIES := \

  android.hardware.drm@1.0-helper \



LOCAL_C_INCLUDES := \

  hardware/interfaces/drm
@@ -71,10 +74,12 @@ LOCAL_SHARED_LIBRARIES := \ 
    libhidlmemory \

    libhidltransport \

    liblog \

    libmediadrm \

    libstagefright_foundation \

    libutils \



LOCAL_STATIC_LIBRARIES := \

    android.hardware.drm@1.0-helper \



LOCAL_C_INCLUDES := \

    frameworks/native/include \

    frameworks/av/include

drm/1.0/default/CryptoFactory.h

+3 −2
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
#include <android/hardware/drm/1.0/ICryptoFactory.h>

#include <hidl/Status.h>

#include <media/hardware/CryptoAPI.h>

#include <media/PluginLoader.h>

#include <PluginLoader.h>

#include <media/SharedLibrary.h>



namespace android {
@@ -28,6 +28,7 @@ namespace drm { 
namespace V1_0 {

namespace implementation {



using ::android::hardware::drm::V1_0::helper::PluginLoader;

using ::android::hardware::drm::V1_0::ICryptoFactory;

using ::android::hardware::drm::V1_0::ICryptoPlugin;

using ::android::hardware::hidl_array;
@@ -51,7 +52,7 @@ struct CryptoFactory : public ICryptoFactory { 
            override;



private:

    android::PluginLoader<android::CryptoFactory> loader;

    PluginLoader<android::CryptoFactory> loader;



    CryptoFactory(const CryptoFactory &) = delete;

    void operator=(const CryptoFactory &) = delete;