Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 881ec090 authored by Gaurav Shah's avatar Gaurav Shah Committed by android-build-merger
Browse files

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

am: acb8a7c1

* commit 'acb8a7c1':
  build: Add support for defining products in /product
parents cce30b6d acb8a7c1

core/product.mk

+1 −0
Original line number Diff line number Diff line
@@ -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

envsetup.sh

+2 −1
Original line number Diff line number Diff line
@@ -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