commit ce4670977d0367983e40ed339da793792fdb6e06
author Ying Wang <wangying@android.com> Thu Mar 31 15:14:32 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Mar 31 15:14:32 2011 -0700
tree ad49ebbb87e20e8db666c71d017c94c812e92875
parent 0c47a6919c162745e5295246ee6b4418c5ac4012
parent 54aa74ef5da0a76a0fc1afdabaa24d2fb0744cd1

am 54aa74ef: am a9e5bb8a: am f78fb1d1: Merge "Use my-dir in a consistent way as others"

* commit '54aa74ef5da0a76a0fc1afdabaa24d2fb0744cd1':
  Use my-dir in a consistent way as others

core/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index 6db9d8f..e099be3 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -154,7 +154,7 @@
 
 # $(1): List of directories to look for under this directory
 define all-named-subdir-makefiles
-$(wildcard $(addsuffix /Android.mk, $(addprefix $(my-dir)/,$(1))))
+$(wildcard $(addsuffix /Android.mk, $(addprefix $(call my-dir)/,$(1))))
 endef
 
 ###########################################################

tools/Android.mk

diff --git a/tools/Android.mk b/tools/Android.mk
index fa9d0b7..92603f5 100644
--- a/tools/Android.mk
+++ b/tools/Android.mk
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-LOCAL_PATH := $(my-dir)
+LOCAL_PATH := $(call my-dir)
 
 # If we're building only unbundled apps, this is the only tool we need.
 ifneq ($(TARGET_BUILD_APPS),)