summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYing Wang <wangying@google.com>2014-03-01 02:10:43 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-03-01 02:10:43 +0000
commit32e865f451d2fbb97e5bb27300f8e4da803fb790 (patch)
tree2eeb364f7aa38006a53a8f1f9f9977724b8ddf05
parent298eac1548462c05e9c417abb0e401d805700e82 (diff)
parentc7afcd0a8aa1c1710ba37688f1843f31ff377af3 (diff)
downloadandroid_frameworks_wilhelm-32e865f451d2fbb97e5bb27300f8e4da803fb790.tar.gz
android_frameworks_wilhelm-32e865f451d2fbb97e5bb27300f8e4da803fb790.tar.bz2
android_frameworks_wilhelm-32e865f451d2fbb97e5bb27300f8e4da803fb790.zip
Merge "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))