diff options
| author | John W. Bruce <juce@google.com> | 2017-03-23 22:40:17 -0700 |
|---|---|---|
| committer | John W. Bruce <juce@google.com> | 2017-04-06 01:04:27 -0700 |
| commit | fcde9ff3a08a2c569f0ec90fa3487ecb9d34444d (patch) | |
| tree | 4692597bd87a2032c755b670c82a74494d3cf80d /drm/1.0/default/CryptoFactory.cpp | |
| parent | ccc1d2e736b1597f8005ae01e3b1e0eee4deb983 (diff) | |
Add Flag for Enabling 64-bit Legacy DRM Plugins
We are ready for devices to begin migrating to a 64-bit Legacy DRM
Loader. However, not all devices are ready to make this jump yet. A
device needs to have all of its Legacy DRM Plugins ready to run as
64-bit before it can do this. This includes having 64-bit hardware
integrations.
So that devices can turn on 64-bit support as they get ready, I am
adding flags that can be set in a device's device.mk file. There are two
parts:
* ENABLE_MEDIADRM_64 enables building the Legacy DRM Plugin HAL as
64-bit.
* Setting drm.64bit.enabled=true in PRODUCT_PROPERTY_OVERRIDES switches
the Legacy DRM Plugin HAL to searching for DRM Plugins in the 64-bit
directory.
Test: Validated that turning on these flags enables a 64-bit Legacy DRM
Plugin HAL that loads 64-bit Legacy DRM Plugins from the lib64
directory.
Bug: 36076017
Change-Id: I8d21fc7e7c0357eb6755839d41caa0f37ca20aff
Diffstat (limited to 'drm/1.0/default/CryptoFactory.cpp')
| -rw-r--r-- | drm/1.0/default/CryptoFactory.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drm/1.0/default/CryptoFactory.cpp b/drm/1.0/default/CryptoFactory.cpp index e46233de2e..935786ddf6 100644 --- a/drm/1.0/default/CryptoFactory.cpp +++ b/drm/1.0/default/CryptoFactory.cpp @@ -17,6 +17,7 @@ #include "CryptoFactory.h" #include "CryptoPlugin.h" +#include "LegacyPluginPath.h" #include "TypeConvert.h" #include <utils/Log.h> @@ -27,7 +28,7 @@ namespace V1_0 { namespace implementation { CryptoFactory::CryptoFactory() : - loader("/vendor/lib/mediadrm", "createCryptoFactory") { + loader(getDrmPluginPath(), "createCryptoFactory") { } // Methods from ::android::hardware::drm::V1_0::ICryptoFactory follow. |