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

Commit f3a591cc authored by Jeff Tinker's avatar Jeff Tinker
Browse files

Enable DRM HIDL HAL by default 

Eliminate ENABLE_TREBLE since it is obsolete.
Switching back to legacy DRM is still possible
by building with DISABLE_TREBLE_DRM=true

Change-Id: I6b921050dff6162112c60df21549fc93bc46e379
parent 70537c1c

drm/libmediadrm/Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ LOCAL_SRC_FILES:= \ 
    IDrmClient.cpp \

    IMediaDrmService.cpp \

    SharedLibrary.cpp

ifeq ($(ENABLE_TREBLE), true)

ifneq ($(DISABLE_TREBLE_DRM), true)

LOCAL_SRC_FILES += \

    DrmHal.cpp \

    CryptoHal.cpp
@@ -31,7 +31,7 @@ LOCAL_SHARED_LIBRARIES := \ 
    libmediautils \

    libstagefright_foundation \

    libutils

ifeq ($(ENABLE_TREBLE), true)

ifneq ($(DISABLE_TREBLE_DRM), true)

LOCAL_SHARED_LIBRARIES += \

    android.hidl.base@1.0 \

    android.hardware.drm@1.0 \

drm/libmediadrm/DrmHal.cpp

+2 −0
Original line number Diff line number Diff line
@@ -202,6 +202,8 @@ sp<IDrmFactory> DrmHal::makeDrmFactory() { 
    if (factory == NULL) {

        ALOGE("Failed to make drm factory");

    }

    ALOGD("makeDrmFactory: service is %s",

            factory->isRemote() ? "Remote" : "Not Remote");

    return factory;

}

services/mediadrm/Android.mk

+3 −3
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ LOCAL_SHARED_LIBRARIES:= \ 
    liblog \

    libmediadrm \

    libutils

ifeq ($(ENABLE_TREBLE), true)

ifneq ($(DISABLE_TREBLE_DRM), true)

LOCAL_SHARED_LIBRARIES += \

    libhidlbase \

    libhidlmemory \
@@ -34,8 +34,8 @@ LOCAL_SHARED_LIBRARIES += \ 
endif



LOCAL_CFLAGS += -Wall -Wextra -Werror

ifeq ($(ENABLE_TREBLE), true)

LOCAL_CFLAGS += -DENABLE_TREBLE=1

ifeq ($(DISABLE_TREBLE_DRM), true)

LOCAL_CFLAGS += -DDISABLE_TREBLE_DRM=1

endif



LOCAL_MODULE:= mediadrmserver

services/mediadrm/MediaDrmService.cpp

+10 −10
Original line number Diff line number Diff line
@@ -24,12 +24,12 @@ 
#include <binder/IServiceManager.h>

#include <utils/Log.h>



#ifdef ENABLE_TREBLE

#include <media/CryptoHal.h>

#include <media/DrmHal.h>

#else

#ifdef DISABLE_TREBLE_DRM

#include <media/Crypto.h>

#include <media/Drm.h>

#else

#include <media/CryptoHal.h>

#include <media/DrmHal.h>

#endif



namespace android {
@@ -40,18 +40,18 @@ void MediaDrmService::instantiate() { 
}



sp<ICrypto> MediaDrmService::makeCrypto() {

#ifdef ENABLE_TREBLE

    return new CryptoHal;

#else

#ifdef DISABLE_TREBLE_DRM

    return new Crypto;

#else

    return new CryptoHal;

#endif

}



sp<IDrm> MediaDrmService::makeDrm() {

#ifdef ENABLE_TREBLE

    return new DrmHal;

#else

#ifdef DISABLE_TREBLE_DRM

    return new Drm;

#else

    return new DrmHal;

#endif

}