summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorYing Wang <wangying@google.com>2014-03-01 17:35:54 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-01 17:35:54 +0000
commit03c6628f40a2e56a214990da127242707ff02b73 (patch)
tree854b7ea56d177acffaa15d1edbea62f6674aa649 /tools
parent84f494c2782abf4b01f72e3c58bf821ab03afbab (diff)
parent04c5bcf2bb82099fa8c02dd9a38ccac36d326373 (diff)
downloadframeworks_base-03c6628f40a2e56a214990da127242707ff02b73.zip
frameworks_base-03c6628f40a2e56a214990da127242707ff02b73.tar.gz
frameworks_base-03c6628f40a2e56a214990da127242707ff02b73.tar.bz2
am 04c5bcf2: am 160c39d8: am 26026c62: am dd72b6e7: Merge "Fix indirect misuse of ."
* commit '04c5bcf2bb82099fa8c02dd9a38ccac36d326373': Fix indirect misuse of $(my-dir).
Diffstat (limited to 'tools')
-rw-r--r--tools/preload/Android.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/preload/Android.mk b/tools/preload/Android.mk
index f325870..14a4547 100644
--- a/tools/preload/Android.mk
+++ b/tools/preload/Android.mk
@@ -20,4 +20,4 @@ LOCAL_MODULE:= preload
include $(BUILD_HOST_JAVA_LIBRARY)
-include $(call all-subdir-makefiles)
+include $(call all-makefiles-under,$(LOCAL_PATH))