diff --git a/Android.bp b/Android.bp
index 023ab6f..fd5b5cf 100644
--- a/Android.bp
+++ b/Android.bp
@@ -48,6 +48,7 @@
         "-Werror=sometimes-uninitialized",
         "-Wextra",
         "-Wnullable-to-nonnull-conversion",
+        "-Wshadow",
         "-Wsign-compare",
         "-Wtautological-unsigned-zero-compare",
         "-Wthread-safety",
diff --git a/loader/Loader.cpp b/loader/Loader.cpp
index 89bdb80..940ce19 100644
--- a/loader/Loader.cpp
+++ b/loader/Loader.cpp
@@ -431,9 +431,9 @@
         vector<string> csSymNames;
         ret = getSectionSymNames(elfFile, oldName, csSymNames, STT_FUNC);
         if (ret || !csSymNames.size()) return ret;
-        for (size_t i = 0; i < progDefNames.size(); ++i) {
-            if (!progDefNames[i].compare(csSymNames[0] + "_def")) {
-                cs_temp.prog_def = pd[i];
+        for (size_t j = 0; j < progDefNames.size(); ++j) {
+            if (!progDefNames[j].compare(csSymNames[0] + "_def")) {
+                cs_temp.prog_def = pd[j];
                 break;
             }
         }
