summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Ying Wang <wangying@google.com> 2011-07-27 16:59:08 -0700
committer Ying Wang <wangying@google.com> 2011-07-27 16:59:08 -0700
commitd84d6c7b1acb527c289b5ed7fcebe2ee6a5a01ff (patch)
tree78cac894c9a960085b37df16d3de0efe85453cae
parent070ce94b9fd91d1bb22161a85178440cb46d8ece (diff)
Fix uses of all-subdir-makefiles
We should use all-makefiles-under instead. all-subdir-makefiles can be used only before any "include" statement. Before this change, both subdirs were actually not included. Change-Id: I6bf35d07f294a5012c9322096f999ac26e37432f
-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))