From b392641d9b07d6321aed828c983af04115da8aab Mon Sep 17 00:00:00 2001
From: Dave Bort <dbort@android.com>
Date: Tue, 19 May 2009 16:12:22 -0700
Subject: [PATCH] Make $(my-dir) fail if it's called after including
 $(CLEAR_VARS)

---
 core/definitions.mk | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/core/definitions.mk b/core/definitions.mk
index a16ce03e10..297e6b7aef 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -109,7 +109,14 @@ endef
 
 # Figure out where we are.
 define my-dir
-$(patsubst %/,%,$(dir $(lastword $(MAKEFILE_LIST),$(MAKEFILE_LIST))))
+$(strip \
+  $(eval md_file_ := $$(lastword $$(MAKEFILE_LIST))) \
+  $(if $(filter $(CLEAR_VARS),$(md_file_)), \
+    $(error LOCAL_PATH must be set before including $$(CLEAR_VARS)) \
+   , \
+    $(patsubst %/,%,$(dir $(md_file_))) \
+   ) \
+ )
 endef
 
 ###########################################################