commit 54aa74ef5da0a76a0fc1afdabaa24d2fb0744cd1
author Ying Wang <wangying@android.com> Thu Mar 31 15:11:58 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Mar 31 15:11:58 2011 -0700
tree 715d53f42cf810b8784d3add737faaf60cfa6a74
parent 15fcee57aa124c6f690eccab580502ed78e3746b
parent a9e5bb8a6b2b772b07214e4dd0004f6989285dd0

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

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

core/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index 975b6b5..17c8089 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),)