wv hidl: upgrade Drm/Crypto factories to v1.3

Bug: 139134043
Test: MediaDrmTest
Change-Id: I94d1cc8a323c144805d74d5568944dd48ae80e60
This commit is contained in:
Robert Shih
2019-12-02 16:20:13 -08:00
parent 2443fe807a
commit 8fce3e316b
25 changed files with 180 additions and 41 deletions

View File

@@ -72,6 +72,7 @@ LOCAL_SHARED_LIBRARIES := \
android.hardware.drm@1.0 \
android.hardware.drm@1.1 \
android.hardware.drm@1.2 \
android.hardware.drm@1.3 \
libbase \
libdl \
libhidlbase \

View File

@@ -10,7 +10,7 @@
namespace wvdrm {
namespace hardware {
namespace drm {
namespace V1_2 {
namespace V1_3 {
namespace widevine {
using ::android::sp;
@@ -32,7 +32,7 @@ TEST(CreatePluginFactoriesTest, CreatesCryptoFactory) {
}
} // namespace widevine
} // namespace V1_2
} // namespace V1_3
} // namespace drm
} // namespace hardware
} // namespace wvdrm

View File

@@ -10,10 +10,9 @@
namespace wvdrm {
namespace hardware {
namespace drm {
namespace V1_2 {
namespace V1_3 {
namespace widevine {
using wvdrm::hardware::drm::V1_2::widevine::WVCryptoFactory;
using ::android::sp;
const uint8_t kWidevineUUID[16] = {
@@ -49,7 +48,7 @@ TEST(WVCryptoFactoryTest, DoesNotSupportUnsupportedCryptoSchemes) {
}
} // namespace widevine
} // namespace V1_2
} // namespace V1_3
} // namespace drm
} // namespace hardware
} // namespace wvdrm

View File

@@ -13,7 +13,7 @@
namespace wvdrm {
namespace hardware {
namespace drm {
namespace V1_2 {
namespace V1_3 {
namespace widevine {
using namespace android;
@@ -144,7 +144,7 @@ TEST(WVDrmFactoryTest, CalculatesBlankAppPackageNamePermissibilityCorrectly) {
}
} // namespace widevine
} // namespace V1_2
} // namespace V1_3
} // namespace drm
} // namespace hardware
} // namespace wvdrm