commit a80f1e32575db5d66f4b4e6efdf79dd10dd2295e
author Gaurav Shah <gauravsh@google.com> Mon Nov 02 22:22:32 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Nov 02 22:22:32 2015 +0000
tree 3eb0e31f8596a4796d8b7cc78846c4d3c9df51de
parent acb8a7c1f8cacaf136edba1a25d64467d352a432
parent 04ba31236e694c6d4c3347dae3631e45a48209ae

Merge "build: Add extra build customization for /product"

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 2f7ebdf..3a323d1 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1972,9 +1972,11 @@
 include $(sort $(wildcard $(BUILD_SYSTEM)/tasks/*.mk))
 -include $(sort $(wildcard vendor/*/build/tasks/*.mk))
 -include $(sort $(wildcard device/*/build/tasks/*.mk))
+-include $(sort $(wildcard product/*/build/tasks/*.mk))
 # Also the project-specific tasks
 -include $(sort $(wildcard vendor/*/*/build/tasks/*.mk))
 -include $(sort $(wildcard device/*/*/build/tasks/*.mk))
+-include $(sort $(wildcard product/*/*/build/tasks/*.mk))
 endif
 
 include $(BUILD_SYSTEM)/product-graph.mk

core/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index ecc7253..ce7602b 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -2547,6 +2547,7 @@
 # Include any vendor specific definitions.mk file
 -include $(TOPDIR)vendor/*/build/core/definitions.mk
 -include $(TOPDIR)device/*/build/core/definitions.mk
+-include $(TOPDIR)product/*/build/core/definitions.mk
 
 # broken:
 #	$(foreach file,$^,$(if $(findstring,.a,$(suffix $file)),-l$(file),$(file)))