diff --git a/Android.mk b/Android.mk
index 43c083ca7b6ac03309cc845f0fc24c578ce42b74..29c1e7888e876feb192f6d33050a47b0f504a347 100644
--- a/Android.mk
+++ b/Android.mk
@@ -20,7 +20,7 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
 LOCAL_JAVACFLAGS += -g -Xlint
-include tools/tradefederation/error_prone_rules.mk
+-include tools/tradefederation/core/error_prone_rules.mk
 
 LOCAL_MODULE := loganalysis
 LOCAL_MODULE_TAGS := optional
diff --git a/tests/Android.mk b/tests/Android.mk
index 8f2a768b6d6b40c3c972d3c5c846bf58f1eef4f5..5b71e211c9b196788ca858e5deb0a1b85d5f8f66 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -20,7 +20,7 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
 LOCAL_JAVACFLAGS += -g -Xlint
-include tools/tradefederation/error_prone_rules.mk
+-include tools/tradefederation/core/error_prone_rules.mk
 
 LOCAL_MODULE := loganalysis-tests
 LOCAL_MODULE_TAGS := optional