Merge "Use -Werror in external/scrypt" am: bcc2d0c8ec am: 1ef1ce7c0e

am: 9b1807ba4f

Change-Id: I46ba02355d43658274c97adb530b63f9794269ee

2 files changed, 5 insertions, 0 deletions

diff --git a/Android.bp b/Android.bp
index ef9b8a0..34c0718 100644
--- a/Android.bp
+++ b/Android.bp
@@ -28,6 +28,7 @@ cc_library_static {
 cc_test {
     name: "scrypt_test",
     srcs: ["tests/scrypt_test.cpp"],
+    cflags: ["-Wall", "-Werror"],
     shared_libs: ["libcrypto"],
     static_libs: ["libscrypt_static"],
 }
diff --git a/sources.bp b/sources.bp
index a2ba3f4..8c7f886 100644
--- a/sources.bp
+++ b/sources.bp
@@ -25,6 +25,10 @@ cc_defaults {
     cflags: [
         "-DHAVE_CONFIG_H",
         "-DUSE_OPENSSL_PBKDF2",
+        "-Wall",
+        "-Werror",
+        "-Wno-error=implicit-function-declaration",
+        "-Wno-error=unused-variable",
     ],
 
     export_include_dirs: [