summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Ying Wang <wangying@google.com> 2011-07-27 18:29:26 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 2011-07-27 18:29:26 -0700
commit00fd1fc9b38a2e59b5ab5ad3f19a6e581dc5f428 (patch)
tree4611d25d95b5cf8d4778d0be2f05bba42124633d
parent06a2895b58d6d8ecc3fc5dffa8c5d8c4f95216a5 (diff)
parentd84d6c7b1acb527c289b5ed7fcebe2ee6a5a01ff (diff)
Merge "Fix uses of all-subdir-makefiles"
-rw-r--r--libs/ui/tests/Android.mk2
-rw-r--r--services/input/tests/Android.mk2
2 files changed, 2 insertions, 2 deletions
diff --git a/libs/ui/tests/Android.mk b/libs/ui/tests/Android.mk
index 693a32aa0290..700b60479a52 100644
--- a/libs/ui/tests/Android.mk
+++ b/libs/ui/tests/Android.mk
@@ -45,4 +45,4 @@ $(foreach file,$(test_src_files), \
)
# Build the manual test programs.
-include $(call all-subdir-makefiles)
+include $(call all-makefiles-under, $(LOCAL_PATH))
diff --git a/services/input/tests/Android.mk b/services/input/tests/Android.mk
index d92fc7469832..171db3c68b14 100644
--- a/services/input/tests/Android.mk
+++ b/services/input/tests/Android.mk
@@ -42,4 +42,4 @@ $(foreach file,$(test_src_files), \
)
# Build the manual test programs.
-include $(call all-subdir-makefiles)
+include $(call all-makefiles-under, $(LOCAL_PATH))