Merge "Enable pedantic checks for uninitialized variables"

2 files changed, 3 insertions, 1 deletions

diff --git a/Android.bp b/Android.bp
index 114b2e16..97637304 100644
--- a/Android.bp
+++ b/Android.bp
@@ -10,6 +10,8 @@ cc_defaults {
         "-Werror",
         // Override -Wno-error=implicit-fallthrough from soong
         "-Werror=implicit-fallthrough",
+        "-Werror=sometimes-uninitialized",
+        "-Werror=conditional-uninitialized",
         "-Wnullable-to-nonnull-conversion",
         "-Wsign-compare",
         "-Wthread-safety",
diff --git a/server/ResolvStub.cpp b/server/ResolvStub.cpp
index d6bcb05a..2fb66254 100644
--- a/server/ResolvStub.cpp
+++ b/server/ResolvStub.cpp
@@ -55,7 +55,7 @@ static void resolvStubInitFunction(void* handle, const char* symbol, FunctionTyp
 }
 
 int resolv_stub_init() {
-    void* netdResolvHandle;
+    void* netdResolvHandle = nullptr;
 
     for (const auto& dir : {APEX_LIB64_DIR, APEX_LIB_DIR}) {
         std::string path = std::string(dir) + "/" + LIBNAME;