commit 7de61d1471cd8938ade62ae439cad11ea141cf40
author Jean-Baptiste Queru <jbq@google.com> Wed Aug 08 13:07:59 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Aug 08 13:07:59 2012 -0700
tree da499a4f25f814e33ce1522659fe2bb9b2e172fe
parent 0207498d6e1933244c287eed7737c0518d7d8a26
parent 04363aa5bd7ae0f2b5a8d09c25a83371933d0d12

am 04363aa5: am af541a64: Merge "core/Makefile: also look for device/*/build/tasks"

* commit '04363aa5bd7ae0f2b5a8d09c25a83371933d0d12':
  core/Makefile: also look for device/*/build/tasks

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 6b46451..9580504 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1492,6 +1492,7 @@
 # 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