diff --git a/GNUmakefile b/GNUmakefile
index a2424897..84eecbde 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -1,5 +1,5 @@
-ifneq ("$(SETUP_SH_SOURCED)","y")
-$(error Must source setup.sh to use make directly)
+ifeq ("$(ANDROID_BUILD_TOP)","")
+$(error Must source setup.sh or build/envsetup.sh to use make directly)
 else
 include Makefile
 endif