From 3da5b01946c9807d52e41feb725607e05765a862 Mon Sep 17 00:00:00 2001 From: Chih-Hung Hsieh Date: Fri, 29 Sep 2017 15:15:48 -0700 Subject: [PATCH] Use -Werror in hardware/interfaces * Remove unused local variables. Bug: 66996870 Test: build with WITH_TIDY=1 Change-Id: I48dbbf670cc9eeff2391983788983420f8547cc9 --- audio/common/2.0/default/Android.bp | 1 + 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 -- minijail/Android.bp | 1 + nfc/1.0/default/Android.bp | 1 + radio/1.0/vts/functional/Android.bp | 1 + tests/hash/1.0/default/Android.bp | 1 + tests/libhwbinder/1.0/default/Android.bp | 1 + tests/libhwbinder/aidl/Android.bp | 1 + tests/msgq/1.0/default/Android.bp | 2 ++ wifi/1.0/vts/functional/Android.bp | 1 + 12 files changed, 11 insertions(+), 7 deletions(-) diff --git a/audio/common/2.0/default/Android.bp b/audio/common/2.0/default/Android.bp index 0486a5c723..7fab220fcf 100644 --- a/audio/common/2.0/default/Android.bp +++ b/audio/common/2.0/default/Android.bp @@ -15,6 +15,7 @@ cc_library_shared { name: "android.hardware.audio.common@2.0-util", + defaults: ["hidl_defaults"], vendor_available: true, srcs: [ "EffectMap.cpp", diff --git a/drm/1.0/vts/functional/Android.bp b/drm/1.0/vts/functional/Android.bp index b45ce848df..18aebee4a9 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 04f265866c..194b2a7bba 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 33fb6fbac3..389ffec706 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]; diff --git a/minijail/Android.bp b/minijail/Android.bp index b95f0298bc..c01a12bf83 100644 --- a/minijail/Android.bp +++ b/minijail/Android.bp @@ -1,5 +1,6 @@ cc_library_shared { name: "libhwminijail", + defaults: ["hidl_defaults"], vendor: true, export_include_dirs: ["include"], diff --git a/nfc/1.0/default/Android.bp b/nfc/1.0/default/Android.bp index d7f720308e..3b53d16926 100644 --- a/nfc/1.0/default/Android.bp +++ b/nfc/1.0/default/Android.bp @@ -19,6 +19,7 @@ cc_library_shared { cc_binary { name: "android.hardware.nfc@1.0-service", + defaults: ["hidl_defaults"], relative_install_path: "hw", proprietary: true, init_rc: ["android.hardware.nfc@1.0-service.rc"], diff --git a/radio/1.0/vts/functional/Android.bp b/radio/1.0/vts/functional/Android.bp index 82a8a7292a..61136ae644 100644 --- a/radio/1.0/vts/functional/Android.bp +++ b/radio/1.0/vts/functional/Android.bp @@ -50,6 +50,7 @@ cc_test { cc_library_static { name: "RadioVtsTestUtilBase", + defaults: ["hidl_defaults"], srcs : [ "vts_test_util.cpp" ], diff --git a/tests/hash/1.0/default/Android.bp b/tests/hash/1.0/default/Android.bp index ae44876c45..67f90977d6 100644 --- a/tests/hash/1.0/default/Android.bp +++ b/tests/hash/1.0/default/Android.bp @@ -1,5 +1,6 @@ cc_library_shared { name: "android.hardware.tests.hash@1.0-impl", + defaults: ["hidl_defaults"], relative_install_path: "hw", srcs: [ "Hash.cpp", diff --git a/tests/libhwbinder/1.0/default/Android.bp b/tests/libhwbinder/1.0/default/Android.bp index f1f99a63db..3d18720d83 100644 --- a/tests/libhwbinder/1.0/default/Android.bp +++ b/tests/libhwbinder/1.0/default/Android.bp @@ -1,5 +1,6 @@ cc_library_shared { name: "android.hardware.tests.libhwbinder@1.0-impl", + defaults: ["hidl_defaults"], relative_install_path: "hw", srcs: [ "Benchmark.cpp", diff --git a/tests/libhwbinder/aidl/Android.bp b/tests/libhwbinder/aidl/Android.bp index a662085bf5..6d497049b3 100644 --- a/tests/libhwbinder/aidl/Android.bp +++ b/tests/libhwbinder/aidl/Android.bp @@ -1,5 +1,6 @@ cc_library_shared { name: "android.hardware.tests.libbinder", + defaults: ["hidl_defaults"], srcs: ["android/tests/binder/IBenchmark.aidl"], diff --git a/tests/msgq/1.0/default/Android.bp b/tests/msgq/1.0/default/Android.bp index eb25ac2e19..be4fe94543 100644 --- a/tests/msgq/1.0/default/Android.bp +++ b/tests/msgq/1.0/default/Android.bp @@ -35,6 +35,7 @@ cc_library_shared { cc_test { name: "android.hardware.tests.msgq@1.0-service-benchmark", + defaults: ["hidl_defaults"], srcs: ["mq_benchmark_service.cpp"], gtest: false, @@ -51,6 +52,7 @@ cc_test { cc_test { name: "android.hardware.tests.msgq@1.0-service-test", + defaults: ["hidl_defaults"], srcs: ["mq_test_service.cpp"], gtest: false, diff --git a/wifi/1.0/vts/functional/Android.bp b/wifi/1.0/vts/functional/Android.bp index e164cdf4d6..10f1987a06 100644 --- a/wifi/1.0/vts/functional/Android.bp +++ b/wifi/1.0/vts/functional/Android.bp @@ -16,6 +16,7 @@ cc_library_static { name: "VtsHalWifiV1_0TargetTestUtil", + defaults: ["hidl_defaults"], srcs: [ "wifi_hidl_call_util_selftest.cpp",