diff --git a/libc/Android.mk b/libc/Android.mk
index 04b8ed1..26da523 100644
--- a/libc/Android.mk
+++ b/libc/Android.mk
@@ -731,6 +731,7 @@
 LOCAL_CFLAGS := $(libc_common_cflags) -fno-stack-protector
 LOCAL_C_INCLUDES := $(libc_common_c_includes)
 LOCAL_MODULE := libbionic_ssp
+LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 LOCAL_SYSTEM_SHARED_LIBRARIES :=
 
 include $(BUILD_STATIC_LIBRARY)
@@ -751,6 +752,7 @@
     -include upstream-netbsd/netbsd-compat.h
 LOCAL_C_INCLUDES := $(libc_common_c_includes)
 LOCAL_MODULE := libc_netbsd
+LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 LOCAL_SYSTEM_SHARED_LIBRARIES :=
 
 include $(BUILD_STATIC_LIBRARY)
@@ -769,6 +771,7 @@
 endif
 LOCAL_C_INCLUDES := $(libc_common_c_includes)
 LOCAL_MODULE := libc_common
+LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 LOCAL_WHOLE_STATIC_LIBRARIES := libbionic_ssp libc_netbsd
 LOCAL_SYSTEM_SHARED_LIBRARIES :=
 
@@ -797,6 +800,7 @@
                 -DLIBC_STATIC
 
 LOCAL_MODULE := libc_nomalloc
+LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 LOCAL_WHOLE_STATIC_LIBRARIES := libc_common
 LOCAL_SYSTEM_SHARED_LIBRARIES :=
 
@@ -819,6 +823,7 @@
                 -DLIBC_STATIC
 LOCAL_C_INCLUDES := $(libc_common_c_includes)
 LOCAL_MODULE := libc
+LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 LOCAL_WHOLE_STATIC_LIBRARIES := libc_common
 LOCAL_SYSTEM_SHARED_LIBRARIES :=
 
@@ -848,6 +853,7 @@
 	bionic/libc_init_dynamic.c
 
 LOCAL_MODULE:= libc
+LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 
 # WARNING: The only library libc.so should depend on is libdl.so!  If you add other libraries,
 # make sure to add -Wl,--exclude-libs=libgcc.a to the LOCAL_LDFLAGS for those libraries.  This
@@ -890,6 +896,7 @@
 	bionic/malloc_debug_stacktrace.c
 
 LOCAL_MODULE:= libc_malloc_debug_leak
+LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 
 LOCAL_SHARED_LIBRARIES := libc
 LOCAL_WHOLE_STATIC_LIBRARIES := libc_common
@@ -917,6 +924,7 @@
 	bionic/malloc_debug_qemu.c
 
 LOCAL_MODULE:= libc_malloc_debug_qemu
+LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 
 LOCAL_SHARED_LIBRARIES := libc libdl
 LOCAL_WHOLE_STATIC_LIBRARIES := libc_common
diff --git a/libc/zoneinfo/Android.mk b/libc/zoneinfo/Android.mk
index 716aab2..7cd9139 100644
--- a/libc/zoneinfo/Android.mk
+++ b/libc/zoneinfo/Android.mk
@@ -3,6 +3,7 @@
 ############################################
 include $(CLEAR_VARS)
 LOCAL_MODULE := zoneinfo.dat
+LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 LOCAL_SRC_FILES := $(LOCAL_MODULE)
 LOCAL_MODULE_CLASS := ETC
 LOCAL_MODULE_TAGS := optional
@@ -12,6 +13,7 @@
 ############################################
 include $(CLEAR_VARS)
 LOCAL_MODULE := zoneinfo.idx
+LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 LOCAL_SRC_FILES := $(LOCAL_MODULE)
 LOCAL_MODULE_CLASS := ETC
 LOCAL_MODULE_TAGS := optional
@@ -21,6 +23,7 @@
 ############################################
 include $(CLEAR_VARS)
 LOCAL_MODULE := zoneinfo.version
+LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 LOCAL_SRC_FILES := $(LOCAL_MODULE)
 LOCAL_MODULE_CLASS := ETC
 LOCAL_MODULE_TAGS := optional
@@ -34,6 +37,7 @@
 ############################################
 include $(CLEAR_VARS)
 LOCAL_MODULE := zoneinfo-host.dat
+LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 LOCAL_IS_HOST_MODULE := true
 LOCAL_SRC_FILES := zoneinfo.dat
 LOCAL_MODULE_CLASS := ETC
@@ -45,6 +49,7 @@
 ############################################
 include $(CLEAR_VARS)
 LOCAL_MODULE := zoneinfo-host.idx
+LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 LOCAL_IS_HOST_MODULE := true
 LOCAL_SRC_FILES := zoneinfo.idx
 LOCAL_MODULE_CLASS := ETC
@@ -56,6 +61,7 @@
 ############################################
 include $(CLEAR_VARS)
 LOCAL_MODULE := zoneinfo-host.version
+LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 LOCAL_IS_HOST_MODULE := true
 LOCAL_SRC_FILES := zoneinfo.version
 LOCAL_MODULE_CLASS := ETC
diff --git a/libdl/Android.mk b/libdl/Android.mk
index fb01ec2..e6c6bf4 100644
--- a/libdl/Android.mk
+++ b/libdl/Android.mk
@@ -6,11 +6,11 @@
 
 include $(CLEAR_VARS)
 
-# NOTE: --exclude-libs=libgcc.a makes sure that any symbols libdl.so pulls from 
+# NOTE: --exclude-libs=libgcc.a makes sure that any symbols libdl.so pulls from
 # libgcc.a are made static to libdl.so.  This in turn ensures that libraries that
 # a) pull symbols from libgcc.a and b) depend on libdl.so will not rely on libdl.so
 # to provide those symbols, but will instead pull them from libgcc.a.  Specifically,
-# we use this property to make sure libc.so has its own copy of the code from 
+# we use this property to make sure libc.so has its own copy of the code from
 # libgcc.a it uses.
 #
 # DO NOT REMOVE --exclude-libs!
@@ -25,6 +25,7 @@
 LOCAL_SRC_FILES:= libdl.c
 
 LOCAL_MODULE:= libdl
+LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 
 # NOTE: libdl needs __aeabi_unwind_cpp_pr0 from libgcc.a but libgcc.a needs a
 # few symbols from libc. Using --no-undefined here results in having to link
@@ -32,7 +33,7 @@
 # with missing symbols. Since this library is just a bunch of stubs, we set
 # LOCAL_ALLOW_UNDEFINED_SYMBOLS to remove --no-undefined from the linker flags.
 LOCAL_ALLOW_UNDEFINED_SYMBOLS := true
-LOCAL_SYSTEM_SHARED_LIBRARIES := 
+LOCAL_SYSTEM_SHARED_LIBRARIES :=
 
 include $(BUILD_SHARED_LIBRARY)
 
@@ -47,7 +48,8 @@
 
 LOCAL_SRC_FILES:= dltest.c
 
-LOCAL_MODULE:= dltest 
+LOCAL_MODULE:= dltest
+LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 
 LOCAL_SHARED_LIBRARIES := libdl
 
diff --git a/libm/Android.mk b/libm/Android.mk
index 756c9ab..9c88798 100644
--- a/libm/Android.mk
+++ b/libm/Android.mk
@@ -202,6 +202,7 @@
 LOCAL_CFLAGS := $(libm_common_cflags)
 
 LOCAL_MODULE:= libm
+LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 
 LOCAL_SYSTEM_SHARED_LIBRARIES := libc
 
@@ -221,6 +222,7 @@
 LOCAL_CFLAGS := $(libm_common_cflags)
 
 LOCAL_MODULE:= libm
+LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 
 LOCAL_SYSTEM_SHARED_LIBRARIES := libc
 
diff --git a/libstdc++/Android.mk b/libstdc++/Android.mk
index 7d27aa8..41e6c4d 100644
--- a/libstdc++/Android.mk
+++ b/libstdc++/Android.mk
@@ -19,6 +19,7 @@
 	src/typeinfo.cpp
 
 LOCAL_MODULE:= libstdc++
+LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 
 LOCAL_CFLAGS := $(libstdc++_cflags)
 
@@ -37,6 +38,7 @@
 LOCAL_CFLAGS := $(libstdc++_cflags)
 
 LOCAL_MODULE:= libstdc++
+LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 
 LOCAL_SYSTEM_SHARED_LIBRARIES := libc
 
diff --git a/libthread_db/Android.mk b/libthread_db/Android.mk
index af506ed..5defe01 100644
--- a/libthread_db/Android.mk
+++ b/libthread_db/Android.mk
@@ -1,7 +1,7 @@
 LOCAL_PATH:= $(call my-dir)
 
 #
-# static 
+# static
 #
 
 include $(CLEAR_VARS)
@@ -10,6 +10,7 @@
 	libthread_db.c
 
 LOCAL_MODULE:= libthread_db
+LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 
 include $(BUILD_STATIC_LIBRARY)
 
@@ -20,7 +21,8 @@
 include $(CLEAR_VARS)
 
 LOCAL_WHOLE_STATIC_LIBRARIES := libthread_db
-LOCAL_MODULE:=libthread_db
+LOCAL_MODULE := libthread_db
+LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 LOCAL_SHARED_LIBRARIES := libdl libc
 LOCAL_ALLOW_UNDEFINED_SYMBOLS := false
 LOCAL_SYSTEM_SHARED_LIBRARIES :=
diff --git a/linker/Android.mk b/linker/Android.mk
index b519976..99618f5 100644
--- a/linker/Android.mk
+++ b/linker/Android.mk
@@ -45,6 +45,7 @@
 endif
 
 LOCAL_MODULE:= linker
+LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 
 LOCAL_STATIC_LIBRARIES := libc_nomalloc