Merge "build: Add extra build customization for /product" am: a80f1e3257 am: 64ea350dd8
am: 8e712959cf
* commit '8e712959cf8a8b9b454d1e50f960eef9d97cfbc9':
build: Add extra build customization for /product
diff --git a/core/Makefile b/core/Makefile
index fe282ca..8a86c01 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
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)))