diff --git a/Android.bp b/Android.bp
index 38f8463..aea95a6 100644
--- a/Android.bp
+++ b/Android.bp
@@ -18,10 +18,6 @@
         "-Wall",
         "-Wextra",
         "-Weffc++",
-        "-Weverything",
-        "-Wno-c++98-compat",
-        "-Wno-c++98-compat-pedantic",
-        "-Wno-padded",
         "-Werror",
 
     ],
@@ -53,17 +49,6 @@
     name: "wifilogd_unit_test",
     test_suites: ["device-tests"],
     defaults: ["libwifilogd_flags"],
-    cppflags: [
-        "-Wno-undef",
-        "-Wno-missing-noreturn",
-        "-Wno-shift-sign-overflow",
-        "-Wno-used-but-marked-unused",
-        "-Wno-deprecated",
-        "-Wno-weak-vtables",
-        "-Wno-sign-conversion",
-        "-Wno-global-constructors",
-        "-Wno-covered-switch-default",
-    ],
     srcs: [
         "tests/byte_buffer_unittest.cpp",
         "tests/command_processor_unittest.cpp",