summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYing Wang <wangying@google.com>2014-03-01 09:27:42 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-01 09:27:42 -0800
commit26026c62788f508f9de0df608dd7043e7d1399f6 (patch)
treebfda4b3ed8779c45cacc1e04418b7e57cb21b6a3
parent787d81453ce1e5451bd2c289c8b53cfeda2eab29 (diff)
parentdd72b6e76c5d5e819809bd3d2ef4ff6f700af759 (diff)
downloadframeworks_base-26026c62788f508f9de0df608dd7043e7d1399f6.zip
frameworks_base-26026c62788f508f9de0df608dd7043e7d1399f6.tar.gz
frameworks_base-26026c62788f508f9de0df608dd7043e7d1399f6.tar.bz2
am dd72b6e7: Merge "Fix indirect misuse of ."
* commit 'dd72b6e76c5d5e819809bd3d2ef4ff6f700af759': Fix indirect misuse of $(my-dir).
-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))