summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorYing Wang <wangying@google.com>2014-03-01 17:30:34 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-01 17:30:34 +0000
commit160c39d8a53793cb17dd8a9312d56eafced3cc0d (patch)
treeb0a48ca6a388061e3cb8b95c6b5eebbf37a8a619 /tools
parent9d50308b3e51b871e541397384d8c59d7717bd56 (diff)
parent26026c62788f508f9de0df608dd7043e7d1399f6 (diff)
downloadframeworks_base-160c39d8a53793cb17dd8a9312d56eafced3cc0d.zip
frameworks_base-160c39d8a53793cb17dd8a9312d56eafced3cc0d.tar.gz
frameworks_base-160c39d8a53793cb17dd8a9312d56eafced3cc0d.tar.bz2
am 26026c62: am dd72b6e7: Merge "Fix indirect misuse of ."
* commit '26026c62788f508f9de0df608dd7043e7d1399f6': 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))