commit b392641d9b07d6321aed828c983af04115da8aab
author Dave Bort <dbort@android.com> Tue May 19 16:12:22 2009 -0700
committer Joe Onorato <joeo@android.com> Wed Sep 23 12:58:20 2009 -0700
tree 89c656db3890ef4515d8adbdbc4afba39fb9966e
parent f4dc5f07c0c46a7439bead7379a0846ac0c122b0

Make $(my-dir) fail if it's called after including $(CLEAR_VARS)

core/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index a16ce03..297e6b7 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -109,7 +109,14 @@
 
 # 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
 
 ###########################################################