summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Amith Yamasani <yamasani@google.com> 2014-01-09 21:45:09 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2014-01-09 21:45:10 +0000
commitcd6d1f51e20da71d75e8dbf23ba18b371fb3a8ab (patch)
treeb15a727acabe74874c6efedc063edaeb71c9d9f9
parent7b3cfebce3ab51e96d6c89317ea48b8bce640d9d (diff)
parentba09ada20e9d801068cf51340fee30760203bf51 (diff)
Merge "Include subdirectory Android.mks." into klp-modular-dev
-rw-r--r--services/Android.mk1
-rw-r--r--services/tests/Android.mk3
2 files changed, 4 insertions, 0 deletions
diff --git a/services/Android.mk b/services/Android.mk
index 8bd7629843a4..553159289b8f 100644
--- a/services/Android.mk
+++ b/services/Android.mk
@@ -43,3 +43,4 @@ LOCAL_MODULE:= libandroid_servers
include $(BUILD_SHARED_LIBRARY)
+include $(call all-makefiles-under, $(LOCAL_PATH))
diff --git a/services/tests/Android.mk b/services/tests/Android.mk
new file mode 100644
index 000000000000..40369ee2ec5c
--- /dev/null
+++ b/services/tests/Android.mk
@@ -0,0 +1,3 @@
+LOCAL_PATH:= $(call my-dir)
+
+include $(call all-makefiles-under, $(LOCAL_PATH))