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 | |
parent | ccc1d2e736b1597f8005ae01e3b1e0eee4deb983 (diff) | |
download | android_hardware_interfaces-fcde9ff3a08a2c569f0ec90fa3487ecb9d34444d.tar.gz android_hardware_interfaces-fcde9ff3a08a2c569f0ec90fa3487ecb9d34444d.tar.bz2 android_hardware_interfaces-fcde9ff3a08a2c569f0ec90fa3487ecb9d34444d.zip |
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')
-rw-r--r-- | drm/1.0/default/Android.mk | 16 | ||||
-rw-r--r-- | drm/1.0/default/CryptoFactory.cpp | 3 | ||||
-rw-r--r-- | drm/1.0/default/DrmFactory.cpp | 5 | ||||
-rw-r--r-- | drm/1.0/default/LegacyPluginPath.cpp | 39 | ||||
-rw-r--r-- | drm/1.0/default/LegacyPluginPath.h | 35 |
5 files changed, 91 insertions, 7 deletions
diff --git a/drm/1.0/default/Android.mk b/drm/1.0/default/Android.mk index f2334a083..23a45067b 100644 --- a/drm/1.0/default/Android.mk +++ b/drm/1.0/default/Android.mk @@ -38,9 +38,12 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_C_INCLUDES := \ hardware/interfaces/drm -# TODO: The legacy DRM plugins only support 32-bit. They need -# to be migrated to 64-bit (b/18948909) +# 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 ENABLE_MEDIADRM_64 to build this service as 64-bit. +ifneq ($(ENABLE_MEDIADRM_64), true) LOCAL_32_BIT_ONLY := true +endif include $(BUILD_EXECUTABLE) @@ -55,11 +58,13 @@ LOCAL_SRC_FILES := \ DrmPlugin.cpp \ CryptoFactory.cpp \ CryptoPlugin.cpp \ + LegacyPluginPath.cpp \ TypeConvert.cpp \ LOCAL_SHARED_LIBRARIES := \ android.hardware.drm@1.0 \ android.hidl.memory@1.0 \ + libcutils \ libhidlbase \ libhidlmemory \ libhidltransport \ @@ -72,8 +77,11 @@ LOCAL_C_INCLUDES := \ frameworks/native/include \ frameworks/av/include -# TODO: The legacy DRM plugins only support 32-bit. They need -# to be migrated to 64-bit (b/18948909) +# TODO: Some legacy DRM plugins only support 32-bit. They need to be migrated to +# 64-bit. (b/18948909) Once all of a device's legacy DRM plugins support 64-bit, +# that device can turn on ENABLE_MEDIADRM_64 to build this impl as 64-bit. +ifneq ($(ENABLE_MEDIADRM_64), true) LOCAL_32_BIT_ONLY := true +endif include $(BUILD_SHARED_LIBRARY) diff --git a/drm/1.0/default/CryptoFactory.cpp b/drm/1.0/default/CryptoFactory.cpp index e46233de2..935786ddf 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. diff --git a/drm/1.0/default/DrmFactory.cpp b/drm/1.0/default/DrmFactory.cpp index 9ec0ab700..72466a14f 100644 --- a/drm/1.0/default/DrmFactory.cpp +++ b/drm/1.0/default/DrmFactory.cpp @@ -1,6 +1,6 @@ /* * Copyright (C) 2016 The Android Open Source Project - * +` * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -17,6 +17,7 @@ #include "DrmFactory.h" #include "DrmPlugin.h" +#include "LegacyPluginPath.h" #include "TypeConvert.h" #include <utils/Log.h> @@ -27,7 +28,7 @@ namespace V1_0 { namespace implementation { DrmFactory::DrmFactory() : - loader("/vendor/lib/mediadrm", "createDrmFactory") { + loader(getDrmPluginPath(), "createDrmFactory") { } // Methods from ::android::hardware::drm::V1_0::IDrmFactory follow. diff --git a/drm/1.0/default/LegacyPluginPath.cpp b/drm/1.0/default/LegacyPluginPath.cpp new file mode 100644 index 000000000..369059d2c --- /dev/null +++ b/drm/1.0/default/LegacyPluginPath.cpp @@ -0,0 +1,39 @@ +/* + * Copyright (C) 2017 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "LegacyPluginPath.h" + +#include <cutils/properties.h> + +namespace android { +namespace hardware { +namespace drm { +namespace V1_0 { +namespace implementation { + +const char* getDrmPluginPath() { + if (property_get_bool("drm.64bit.enabled", false)) { + return "/vendor/lib64/mediadrm"; + } else { + return "/vendor/lib/mediadrm"; + } +} + +} // namespace implementation +} // namespace V1_0 +} // namespace drm +} // namespace hardware +} // namespace android diff --git a/drm/1.0/default/LegacyPluginPath.h b/drm/1.0/default/LegacyPluginPath.h new file mode 100644 index 000000000..7145f2e0d --- /dev/null +++ b/drm/1.0/default/LegacyPluginPath.h @@ -0,0 +1,35 @@ +/* + * Copyright (C) 2017 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef LEGACY_PLUGIN_PATH_H_ + +#define LEGACY_PLUGIN_PATH_H_ + +namespace android { +namespace hardware { +namespace drm { +namespace V1_0 { +namespace implementation { + +const char* getDrmPluginPath(); + +} // namespace implementation +} // namespace V1_0 +} // namespace drm +} // namespace hardware +} // namespace android + +#endif // LEGACY_PLUGIN_PATH_H_ |