From 455f6f458df5814e841e176eef51df112df3bc23 Mon Sep 17 00:00:00 2001 From: Lee Campbell Date: Thu, 20 Aug 2015 13:55:45 -0700 Subject: [PATCH] build: Add support for defining products in /product The build will now search for AndroidProducts.mk in /product BUG: 22030305 Change-Id: I2d067d95d0c8dc1341a55167f9ac7f6926e04ce3 --- core/product.mk | 1 + envsetup.sh | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/core/product.mk b/core/product.mk index a9af32554..3b7833742 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 f838d6202..245d5a21d 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