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

Commit 323d172d authored by Jiyong Park's avatar Jiyong Park
Browse files

Build android.hardware.drm@1.0-service with BOARD_VNDK_VERSION 

Instead of relying on the global include paths, use the new headers lib
'media_plugin_headers'. Also, media/SharedLibrary.h is not used, thus deleted.

Bug: 37342627
Test: BOARD_VNDK_VERSION=current m -j android.hardware.drm@1.0-service
Change-Id: I30d8bcb6315b734cef7ad082c432da51eb33119c
parent a26a5b16

drm/1.0/default/Android.mk

+3 −0
Original line number Diff line number Diff line
@@ -42,6 +42,9 @@ LOCAL_STATIC_LIBRARIES := \ 
LOCAL_C_INCLUDES := \

  hardware/interfaces/drm



LOCAL_HEADER_LIBRARIES := \

  media_plugin_headers



# TODO(b/18948909) Some legacy DRM plugins only support 32-bit. They need to be

# migrated to 64-bit. Once all of a device's legacy DRM plugins support 64-bit,

# that device can turn on TARGET_ENABLE_MEDIADRM_64 to build this service as

drm/1.0/default/CryptoFactory.h

+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 
#include <hidl/Status.h>

#include <media/hardware/CryptoAPI.h>

#include <PluginLoader.h>

#include <media/SharedLibrary.h>



namespace android {

namespace hardware {

drm/1.0/default/DrmFactory.h

+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 
#include <hidl/Status.h>

#include <media/drm/DrmAPI.h>

#include <PluginLoader.h>

#include <media/SharedLibrary.h>



namespace android {

namespace hardware {