aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLee Campbell <leecam@google.com>2015-08-20 15:39:56 -0700
committerGaurav Shah <gauravsh@google.com>2015-11-02 14:18:13 -0800
commit04ba31236e694c6d4c3347dae3631e45a48209ae (patch)
treea8d11bef487b750b04afaeb109e7f473d67895ac
parent455f6f458df5814e841e176eef51df112df3bc23 (diff)
downloadbuild-04ba31236e694c6d4c3347dae3631e45a48209ae.tar.gz
build: Add extra build customization for /product
This makes /product more consistent with /device & /vendor BUG: 22030305 Change-Id: Ic65bfde7fb3e9fab8c8fb8d99af15404574abde0
-rw-r--r--core/Makefile2
-rw-r--r--core/definitions.mk1
2 files changed, 3 insertions, 0 deletions
diff --git a/core/Makefile b/core/Makefile
index d94318de71..94585c6b9e 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1966,9 +1966,11 @@ ifneq ($(dont_bother),true)
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
# -----------------------------------------------------------------
diff --git a/core/definitions.mk b/core/definitions.mk
index ecc72532d1..ce7602bf70 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -2547,6 +2547,7 @@ include $(BUILD_SYSTEM)/distdir.mk
# 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)))