summaryrefslogtreecommitdiffstats
path: root/trusty
diff options
context:
space:
mode:
authorChih-Hung Hsieh2017-10-02 17:20:07 -0500
committerChih-Hung Hsieh2017-11-01 13:32:55 -0500
commit122352d983805b8ded5f8f3c07e75844244aba40 (patch)
tree2512a37968404bd39265da943bee33e33e064744 /trusty
parent15251c24b9cbb809aad74d8e5796f0eb6d83d8bb (diff)
downloadplatform-system-core-122352d983805b8ded5f8f3c07e75844244aba40.tar.gz
platform-system-core-122352d983805b8ded5f8f3c07e75844244aba40.tar.xz
platform-system-core-122352d983805b8ded5f8f3c07e75844244aba40.zip
Use -Werror in system/core
* Move -Wall -Werror from cppflags to cflags. * Fix/suppress warning on unused variables. Bug: 66996870 Test: build with WITH_TIDY=1 Change-Id: I1e05e96a1d0bcb2ccef1ce456504b3af57167cc5
Diffstat (limited to 'trusty')
-rw-r--r--trusty/keymaster/Android.bp1
-rw-r--r--trusty/keymaster/trusty_keymaster_main.cpp1
-rw-r--r--trusty/libtrusty/Android.bp1
-rw-r--r--trusty/libtrusty/tipc-test/Android.bp1
4 files changed, 3 insertions, 1 deletions
diff --git a/trusty/keymaster/Android.bp b/trusty/keymaster/Android.bp
index 6b9d72359..773568499 100644
--- a/trusty/keymaster/Android.bp
+++ b/trusty/keymaster/Android.bp
@@ -30,6 +30,7 @@ cc_binary {
30 "trusty_keymaster_ipc.cpp", 30 "trusty_keymaster_ipc.cpp",
31 "trusty_keymaster_main.cpp", 31 "trusty_keymaster_main.cpp",
32 ], 32 ],
33 cflags: ["-Wall", "-Werror"],
33 shared_libs: [ 34 shared_libs: [
34 "libcrypto", 35 "libcrypto",
35 "libcutils", 36 "libcutils",
diff --git a/trusty/keymaster/trusty_keymaster_main.cpp b/trusty/keymaster/trusty_keymaster_main.cpp
index 9c2ae2d0a..ed78b7fb2 100644
--- a/trusty/keymaster/trusty_keymaster_main.cpp
+++ b/trusty/keymaster/trusty_keymaster_main.cpp
@@ -289,7 +289,6 @@ static bool test_import_ecdsa(TrustyKeymasterDevice* device) {
289 std::unique_ptr<const uint8_t[]> deleter(key.key_material); 289 std::unique_ptr<const uint8_t[]> deleter(key.key_material);
290 290
291 printf("=== Signing with imported ECDSA key ===\n"); 291 printf("=== Signing with imported ECDSA key ===\n");
292 keymaster_ec_sign_params_t sign_params = {DIGEST_NONE};
293 size_t message_len = 30 /* arbitrary */; 292 size_t message_len = 30 /* arbitrary */;
294 std::unique_ptr<uint8_t[]> message(new uint8_t[message_len]); 293 std::unique_ptr<uint8_t[]> message(new uint8_t[message_len]);
295 memset(message.get(), 'a', message_len); 294 memset(message.get(), 'a', message_len);
diff --git a/trusty/libtrusty/Android.bp b/trusty/libtrusty/Android.bp
index f316da229..1a8db2f90 100644
--- a/trusty/libtrusty/Android.bp
+++ b/trusty/libtrusty/Android.bp
@@ -21,6 +21,7 @@ cc_library {
21 21
22 srcs: ["trusty.c"], 22 srcs: ["trusty.c"],
23 export_include_dirs: ["include"], 23 export_include_dirs: ["include"],
24 cflags: ["-Wall", "-Werror"],
24 25
25 shared_libs: ["liblog"], 26 shared_libs: ["liblog"],
26} 27}
diff --git a/trusty/libtrusty/tipc-test/Android.bp b/trusty/libtrusty/tipc-test/Android.bp
index cb00fe772..6ec8c23f7 100644
--- a/trusty/libtrusty/tipc-test/Android.bp
+++ b/trusty/libtrusty/tipc-test/Android.bp
@@ -23,4 +23,5 @@ cc_test {
23 "liblog", 23 "liblog",
24 ], 24 ],
25 gtest: false, 25 gtest: false,
26 cflags: ["-Wall", "-Werror"],
26} 27}