summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2012-08-08 13:06:25 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-08-08 13:06:25 -0700
commit04363aa5bd7ae0f2b5a8d09c25a83371933d0d12 (patch)
tree60961ba9a6b93480a8f9e604bb20572d257dbe18
parentc8b7dfb1e308d7dbe426724d21b932b8b79d9ab5 (diff)
parentaf541a64abd16f6a33146a833dce71e739b722c8 (diff)
downloadbuild-04363aa5bd7ae0f2b5a8d09c25a83371933d0d12.zip
build-04363aa5bd7ae0f2b5a8d09c25a83371933d0d12.tar.gz
build-04363aa5bd7ae0f2b5a8d09c25a83371933d0d12.tar.bz2
am af541a64: Merge "core/Makefile: also look for device/*/build/tasks"
* commit 'af541a64abd16f6a33146a833dce71e739b722c8': core/Makefile: also look for device/*/build/tasks
-rw-r--r--core/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/Makefile b/core/Makefile
index fb92027..66520ed 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1489,6 +1489,7 @@ $(INTERNAL_FINDBUGS_HTML_TARGET): $(INTERNAL_FINDBUGS_XML_TARGET)
# These are some additional build tasks that need to be run.
include $(sort $(wildcard $(BUILD_SYSTEM)/tasks/*.mk))
-include $(sort $(wildcard vendor/*/build/tasks/*.mk))
+-include $(sort $(wildcard device/*/build/tasks/*.mk))
# -----------------------------------------------------------------
# Create SDK repository packages. Must be done after tasks/* since