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" am: acb8a7c1f8 

am: 881ec090c4

* commit '881ec090c4790bdd588048f17038d167d7b52d87':
  build: Add support for defining products in /product
This commit is contained in:
Gaurav Shah 2015-11-02 22:29:57 +00:00 committed by android-build-merger
parent 5d95b4aa93 881ec090c4
commit 555489aa84
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
$(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

3
envsetup.sh
View File

@ -1541,7 +1541,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