diff options
| author | Ying Wang <wangying@google.com> | 2014-01-09 20:21:14 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-01-09 20:21:14 +0000 |
| commit | ddf89c0cc847d1fac4d9885d2c91a2fb700e9d0c (patch) | |
| tree | 8e1615a6c34c76773141348e97967ec6c6627c6a | |
| parent | 7dd77a875c723cce75303773ab1909fb2678f731 (diff) | |
| parent | c459bfea7e7be4343387dee137d4a5be9742fd91 (diff) | |
| download | frameworks_base-ddf89c0cc847d1fac4d9885d2c91a2fb700e9d0c.zip frameworks_base-ddf89c0cc847d1fac4d9885d2c91a2fb700e9d0c.tar.gz frameworks_base-ddf89c0cc847d1fac4d9885d2c91a2fb700e9d0c.tar.bz2 | |
Merge "Include subdirectory Android.mks."
| -rw-r--r-- | services/Android.mk | 1 | ||||
| -rw-r--r-- | services/tests/Android.mk | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/services/Android.mk b/services/Android.mk index 8bd7629..5531592 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 0000000..40369ee --- /dev/null +++ b/services/tests/Android.mk @@ -0,0 +1,3 @@ +LOCAL_PATH:= $(call my-dir) + +include $(call all-makefiles-under, $(LOCAL_PATH)) |