Merge "build: Add support for defining products in /product"
This commit is contained in:
commit
acb8a7c1f8
2 changed files with 3 additions and 1 deletions
|
@ -30,6 +30,7 @@
|
|||
define _find-android-products-files
|
||||
$(sort $(shell test -d device && find device -maxdepth 6 -name AndroidProducts.mk)) \
|
||||
$(sort $(shell test -d vendor && find vendor -maxdepth 6 -name AndroidProducts.mk)) \
|
||||
$(sort $(shell test -d product && find product -maxdepth 6 -name AndroidProducts.mk)) \
|
||||
$(SRC_TARGET_DIR)/product/AndroidProducts.mk
|
||||
endef
|
||||
|
||||
|
|
|
@ -1535,7 +1535,8 @@ fi
|
|||
|
||||
# Execute the contents of any vendorsetup.sh files we can find.
|
||||
for f in `test -d device && find -L device -maxdepth 4 -name 'vendorsetup.sh' 2> /dev/null | sort` \
|
||||
`test -d vendor && find -L vendor -maxdepth 4 -name 'vendorsetup.sh' 2> /dev/null | sort`
|
||||
`test -d vendor && find -L vendor -maxdepth 4 -name 'vendorsetup.sh' 2> /dev/null | sort` \
|
||||
`test -d product && find -L product -maxdepth 4 -name 'vendorsetup.sh' 2> /dev/null | sort`
|
||||
do
|
||||
echo "including $f"
|
||||
. $f
|
||||
|
|
Loading…
Reference in a new issue