summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Howard <showard@google.com>2010-09-20 19:31:20 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-20 19:31:20 -0700
commitb4b4817f61386935e076dcd6758887fc6c5213e2 (patch)
tree9e732cc0aa10d5f91b373ef763b01fc1f9c2c6d4
parent1d2fbef2e936034de95f789986851c99f78fe6e1 (diff)
parentb8cadd87bfc628090c36f74979c7691bb1219ea1 (diff)
downloadandroid_packages_providers_DownloadProvider-b4b4817f61386935e076dcd6758887fc6c5213e2.tar.gz
android_packages_providers_DownloadProvider-b4b4817f61386935e076dcd6758887fc6c5213e2.tar.bz2
android_packages_providers_DownloadProvider-b4b4817f61386935e076dcd6758887fc6c5213e2.zip
am b8cadd87: am 2d0ed12e: Fix DownloadProvider makefile to correctly include sub-makefiles
Merge commit 'b8cadd87bfc628090c36f74979c7691bb1219ea1' * commit 'b8cadd87bfc628090c36f74979c7691bb1219ea1': Fix DownloadProvider makefile to correctly include sub-makefiles
-rw-r--r--Android.mk7
1 files changed, 2 insertions, 5 deletions
diff --git a/Android.mk b/Android.mk
index 63def400..2218fe2b 100644
--- a/Android.mk
+++ b/Android.mk
@@ -12,8 +12,5 @@ LOCAL_STATIC_JAVA_LIBRARIES := guava
include $(BUILD_PACKAGE)
-# build UI
-include $(call all-makefiles-under,$(LOCAL_PATH)/ui)
-
-# call tests makefiles
-include $(call all-makefiles-under,$(LOCAL_PATH)/tests)
+# build UI + tests
+include $(call all-makefiles-under,$(LOCAL_PATH))