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

Commit 18d4c4f8 authored by Jeff Tinker's avatar Jeff Tinker Committed by Android (Google) Code Review
Browse files

Merge "Update clearkey plugin to drm HAL v1.2"

parents 54cbc298 b71be20f

drm/mediadrm/plugins/clearkey/hidl/AesCtrDecryptor.cpp

+2 −2
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
namespace android {

namespace hardware {

namespace drm {

namespace V1_1 {

namespace V1_2 {

namespace clearkey {



using ::android::hardware::drm::V1_0::SubSample;
@@ -79,7 +79,7 @@ Status AesCtrDecryptor::decrypt( 
}



} // namespace clearkey

} // namespace V1_1

} // namespace V1_2

} // namespace drm

} // namespace hardware

} // namespace android

drm/mediadrm/plugins/clearkey/hidl/Android.bp

+3 −3
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
//



cc_binary {

    name: "android.hardware.drm@1.1-service.clearkey",

    name: "android.hardware.drm@1.2-service.clearkey",

    vendor: true,



    srcs: [
@@ -39,11 +39,12 @@ cc_binary { 
    relative_install_path: "hw",



    cflags: ["-Wall", "-Werror"],

    init_rc: ["android.hardware.drm@1.1-service.clearkey.rc"],

    init_rc: ["android.hardware.drm@1.2-service.clearkey.rc"],



    shared_libs: [

        "android.hardware.drm@1.0",

        "android.hardware.drm@1.1",

        "android.hardware.drm@1.2",

        "libbase",

        "libbinder",

        "libcrypto",
@@ -69,7 +70,6 @@ cc_binary { 
        integer_overflow: true,

    },

}



cc_library_static {

    name: "libclearkeydevicefiles-protos",

    vendor: true,

drm/mediadrm/plugins/clearkey/hidl/Base64.cpp

+2 −2
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
namespace android {

namespace hardware {

namespace drm {

namespace V1_1 {

namespace V1_2 {

namespace clearkey {



sp<Buffer> decodeBase64(const std::string &s) {
@@ -169,7 +169,7 @@ void encodeBase64Url(const void *_data, size_t size, std::string *out) { 
}



} // namespace clearkey

} // namespace V1_1

} // namespace V1_2

} // namespace drm

} // namespace hardware

} // namespace android

drm/mediadrm/plugins/clearkey/hidl/Buffer.cpp

+2 −2
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
namespace android {

namespace hardware {

namespace drm {

namespace V1_1 {

namespace V1_2 {

namespace clearkey {



Buffer::Buffer(size_t capacity)
@@ -47,7 +47,7 @@ Buffer::~Buffer() { 
}



} // namespace clearkey

} // namespace V1_1

} // namespace V1_2

} // namespace drm

} // namespace hardware

} // namespace android

drm/mediadrm/plugins/clearkey/hidl/CreatePluginFactories.cpp

+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
namespace android {

namespace hardware {

namespace drm {

namespace V1_1 {

namespace V1_2 {

namespace clearkey {



extern "C" {
@@ -38,7 +38,7 @@ ICryptoFactory* createCryptoFactory() { 
} // extern "C"



}  // namespace clearkey

}  // namespace V1_1

}  // namespace V1_2

}  // namespace drm

}  // namespace hardware

}  // namespace android