p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "build: Add support for defining products in /product"

This commit is contained in:
Gaurav Shah 2015-11-02 22:22:22 +00:00 committed by Gerrit Code Review
parent f0a8dd43b2 455f6f458d
commit acb8a7c1f8
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/product.mk
View File

@ -30,6 +30,7 @@
define _find-android-products-files define _find-android-products-files
$(sort $(shell test -d device && find device -maxdepth 6 -name AndroidProducts.mk)) \ $(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 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 $(SRC_TARGET_DIR)/product/AndroidProducts.mk
endef endef

3
envsetup.sh
View File

@ -1535,7 +1535,8 @@ fi
# Execute the contents of any vendorsetup.sh files we can find. # 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` \ 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 do
echo "including $f" echo "including $f"
. $f . $f