android: simplify the including rule of subdirs

Use android build system functions to include Android.mk
of subdirs.

Signed-off-by: Chih-Wei Huang <cwhuang@linux.org.tw>
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
[Emil Velikov: Resolve trivial conflicts.]
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>

diff --git a/Android.mk b/Android.mk
index 0c78fc4..bad4fe1 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -45,13 +45,4 @@ LOCAL_CFLAGS := \
 
 include $(BUILD_SHARED_LIBRARY)
 
-SUBDIRS := \
-       freedreno \
-       intel \
-       nouveau \
-       radeon \
-       libkms \
-       tests/modetest
-
-mkfiles := $(patsubst %,$(LIBDRM_TOP)/%/Android.mk,$(SUBDIRS))
-include $(mkfiles)
+include $(call all-makefiles-under,$(LOCAL_PATH))

diff --git a/tests/Android.mk b/tests/Android.mk
new file mode 100644 (file)
index 0000000..5053e7d
--- /dev/null
+++ b/tests/Android.mk
@@ -0,0 +1 @@
+include $(call all-subdir-makefiles)