summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYing Wang <wangying@google.com>2014-03-01 02:36:30 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-01 02:36:30 +0000
commitcb66e5e0fa527d958f97fe835c35dbbf82810fb9 (patch)
tree4f1e7292109993a770ba813bb389925f4e193377
parenta6babec83b52b08e9d2807afe2be05607fd7a133 (diff)
parent32e865f451d2fbb97e5bb27300f8e4da803fb790 (diff)
downloadandroid_frameworks_wilhelm-cb66e5e0fa527d958f97fe835c35dbbf82810fb9.tar.gz
android_frameworks_wilhelm-cb66e5e0fa527d958f97fe835c35dbbf82810fb9.tar.bz2
android_frameworks_wilhelm-cb66e5e0fa527d958f97fe835c35dbbf82810fb9.zip
am 32e865f4: Merge "Fix indirect misuse of ."
* commit '32e865f451d2fbb97e5bb27300f8e4da803fb790': Fix indirect misuse of $(my-dir).
-rw-r--r--tests/automated/Android.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/automated/Android.mk b/tests/automated/Android.mk
index 76a2401..c6cf7e1 100644
--- a/tests/automated/Android.mk
+++ b/tests/automated/Android.mk
@@ -36,4 +36,4 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_DATA)/nativetest
include $(BUILD_EXECUTABLE)
# Build the manual test programs.
-include $(call all-subdir-makefiles)
+include $(call all-makefiles-under,$(LOCAL_PATH))