diff options
| author | Chih-hung Hsieh <chh@google.com> | 2017-10-04 20:40:30 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-10-04 20:40:30 +0000 |
| commit | 3ed04cd35dbc0f8b9f6c1b4e8f901915f3c146a8 (patch) | |
| tree | b0bdc749edc9395f8c80b1e2400f08b34100e759 /drm | |
| parent | 4aceac6a8d1b09a8bac3c5599f0a27a6ac5a2738 (diff) | |
| parent | 85bb01dd6bb8e2392dff5eafd568b57e8ea5e04d (diff) | |
| download | android_hardware_interfaces-3ed04cd35dbc0f8b9f6c1b4e8f901915f3c146a8.tar.gz android_hardware_interfaces-3ed04cd35dbc0f8b9f6c1b4e8f901915f3c146a8.tar.bz2 android_hardware_interfaces-3ed04cd35dbc0f8b9f6c1b4e8f901915f3c146a8.zip | |
Merge "Use -Werror in hardware/interfaces"
am: 85bb01dd6b
Change-Id: I9169eb99a256f3a1db9e6f82e11fd96228d9558a
Diffstat (limited to 'drm')
| -rw-r--r-- | drm/1.0/vts/functional/Android.bp | 1 | ||||
| -rw-r--r-- | drm/1.0/vts/functional/drm_hal_clearkey_test.cpp | 5 | ||||
| -rw-r--r-- | drm/1.0/vts/functional/drm_hal_vendor_test.cpp | 2 |
3 files changed, 1 insertions, 7 deletions
diff --git a/drm/1.0/vts/functional/Android.bp b/drm/1.0/vts/functional/Android.bp index b45ce848d..18aebee4a 100644 --- a/drm/1.0/vts/functional/Android.bp +++ b/drm/1.0/vts/functional/Android.bp @@ -16,6 +16,7 @@ cc_test { name: "VtsHalDrmV1_0TargetTest", + defaults: ["VtsHalTargetTestDefaults"], srcs: [ "drm_hal_clearkey_test.cpp", "drm_hal_vendor_test.cpp", diff --git a/drm/1.0/vts/functional/drm_hal_clearkey_test.cpp b/drm/1.0/vts/functional/drm_hal_clearkey_test.cpp index 26641e895..84ee5dfc4 100644 --- a/drm/1.0/vts/functional/drm_hal_clearkey_test.cpp +++ b/drm/1.0/vts/functional/drm_hal_clearkey_test.cpp @@ -1063,8 +1063,6 @@ void DrmHalClearkeyDecryptTest::aes_cbc_decrypt(uint8_t* dest, uint8_t* src, AES_set_encrypt_key(&key[0], 128, &decryptionKey); size_t offset = 0; - size_t num = 0; - size_t ecount_buf = 0; for (size_t i = 0; i < subSamples.size(); i++) { memcpy(dest + offset, src + offset, subSamples[i].numBytesOfClearData); offset += subSamples[i].numBytesOfClearData; @@ -1105,7 +1103,6 @@ TEST_F(DrmHalClearkeyDecryptTest, ClearSegmentTest) { Status status = cryptoPlugin->setMediaDrmSession(sessionId); EXPECT_EQ(Status::OK, status); - const bool kNotSecure = false; uint32_t byteCount = decrypt(Mode::UNENCRYPTED, &iv[0], subSamples, noPattern, Status::OK); EXPECT_EQ(kByteCount, byteCount); @@ -1132,7 +1129,6 @@ TEST_F(DrmHalClearkeyDecryptTest, EncryptedAesCtrSegmentTest) { Status status = cryptoPlugin->setMediaDrmSession(sessionId); EXPECT_EQ(Status::OK, status); - const bool kNotSecure = false; uint32_t byteCount = decrypt(Mode::AES_CTR, &iv[0], subSamples, noPattern, Status::OK); EXPECT_EQ(kClearBytes + kEncryptedBytes, byteCount); @@ -1153,7 +1149,6 @@ TEST_F(DrmHalClearkeyDecryptTest, EncryptedAesCtrSegmentTestNoKeys) { Status status = cryptoPlugin->setMediaDrmSession(sessionId); EXPECT_EQ(Status::OK, status); - const bool kNotSecure = false; uint32_t byteCount = decrypt(Mode::AES_CTR, &iv[0], subSamples, noPattern, Status::ERROR_DRM_NO_LICENSE); EXPECT_EQ(0u, byteCount); diff --git a/drm/1.0/vts/functional/drm_hal_vendor_test.cpp b/drm/1.0/vts/functional/drm_hal_vendor_test.cpp index e651e193b..2e080b305 100644 --- a/drm/1.0/vts/functional/drm_hal_vendor_test.cpp +++ b/drm/1.0/vts/functional/drm_hal_vendor_test.cpp @@ -1406,8 +1406,6 @@ void DrmHalVendorDecryptTest::aes_cbc_decrypt(uint8_t* dest, uint8_t* src, AES_set_encrypt_key(&key[0], 128, &decryptionKey); size_t offset = 0; - size_t num = 0; - size_t ecount_buf = 0; for (size_t i = 0; i < subSamples.size(); i++) { const SubSample& subSample = subSamples[i]; |