From 3da5b01946c9807d52e41feb725607e05765a862 Mon Sep 17 00:00:00 2001 From: Chih-Hung Hsieh Date: Fri, 29 Sep 2017 15:15:48 -0700 Subject: Use -Werror in hardware/interfaces * Remove unused local variables. Bug: 66996870 Test: build with WITH_TIDY=1 Change-Id: I48dbbf670cc9eeff2391983788983420f8547cc9 --- drm/1.0/vts/functional/Android.bp | 1 + drm/1.0/vts/functional/drm_hal_clearkey_test.cpp | 5 ----- drm/1.0/vts/functional/drm_hal_vendor_test.cpp | 2 -- 3 files changed, 1 insertion(+), 7 deletions(-) (limited to 'drm') 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 04f265866..194b2a7bb 100644 --- a/drm/1.0/vts/functional/drm_hal_clearkey_test.cpp +++ b/drm/1.0/vts/functional/drm_hal_clearkey_test.cpp @@ -1064,8 +1064,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; @@ -1106,7 +1104,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); @@ -1133,7 +1130,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); @@ -1154,7 +1150,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 33fb6fbac..389ffec70 100644 --- a/drm/1.0/vts/functional/drm_hal_vendor_test.cpp +++ b/drm/1.0/vts/functional/drm_hal_vendor_test.cpp @@ -1407,8 +1407,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]; -- cgit v1.2.3