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

am: 64ea350dd8

* commit '64ea350dd8c2d2b1dc73f753c0bad8e98e12c511':
  build: Add extra build customization for /product
This commit is contained in:
Gaurav Shah 2015-11-02 22:30:03 +00:00 committed by android-build-merger
commit 8e712959cf
2 changed files with 3 additions and 0 deletions

View File

@ -1973,9 +1973,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
include $(BUILD_SYSTEM)/product-graph.mk

View File

@ -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)))