diff options
| author | Lee Campbell <leecam@google.com> | 2015-08-20 13:55:45 -0700 |
|---|---|---|
| committer | Gaurav Shah <gauravsh@google.com> | 2015-11-02 14:17:47 -0800 |
| commit | 455f6f458df5814e841e176eef51df112df3bc23 (patch) | |
| tree | eb4d74694b2297b5e84aa650af048ddba98cdaca | |
| parent | 49d8c5196eb690fc987673c27cb61087c5886be4 (diff) | |
| download | build-455f6f458df5814e841e176eef51df112df3bc23.tar.gz | |
build: Add support for defining products in /product
The build will now search for AndroidProducts.mk in /product
BUG: 22030305
Change-Id: I2d067d95d0c8dc1341a55167f9ac7f6926e04ce3
| -rw-r--r-- | core/product.mk | 1 | ||||
| -rw-r--r-- | envsetup.sh | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/core/product.mk b/core/product.mk index a9af325541..3b78337423 100644 --- a/core/product.mk +++ b/core/product.mk @@ -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 diff --git a/envsetup.sh b/envsetup.sh index f838d62021..245d5a21db 100644 --- a/envsetup.sh +++ b/envsetup.sh @@ -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 |