From a3b3c1afb753d1a05bb3f2f5258b9936257a90ec Mon Sep 17 00:00:00 2001
From: Chih-Wei Huang <cwhuang@linux.org.tw>
Date: Fri, 20 Mar 2015 17:05:46 +0000
Subject: 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>
---
 Android.mk       | 11 +----------
 tests/Android.mk |  1 +
 2 files changed, 2 insertions(+), 10 deletions(-)
 create mode 100644 tests/Android.mk

diff --git a/Android.mk b/Android.mk
index 0c78fc41..bad4fe14 100644
--- 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
index 00000000..5053e7d6
--- /dev/null
+++ b/tests/Android.mk
@@ -0,0 +1 @@
+include $(call all-subdir-makefiles)
-- 
cgit v1.2.3