diff options
| author | Ying Wang <wangying@google.com> | 2010-05-26 13:13:56 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2010-05-26 13:39:31 -0700 |
| commit | 529113098350c026ec521258d4c6fba51f285a48 (patch) | |
| tree | bec1876c0af8a3500c0843aae7cf6dd8245be4da /core/product.mk | |
| parent | 8e5605a774fd2f61c6d5bae0440b20fc0bdd79f7 (diff) | |
| download | build-529113098350c026ec521258d4c6fba51f285a48.zip build-529113098350c026ec521258d4c6fba51f285a48.tar.gz build-529113098350c026ec521258d4c6fba51f285a48.tar.bz2 | |
Cherry-pick unbundled build changes from master
Change-Id: I82cab32f00b7b729d9b01c8e1532c8bf0ad2fb92
Diffstat (limited to 'core/product.mk')
| -rw-r--r-- | core/product.mk | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/core/product.mk b/core/product.mk index eca98ed..38d1148 100644 --- a/core/product.mk +++ b/core/product.mk @@ -29,13 +29,13 @@ $(shell test -d device && find device -maxdepth 6 -name AndroidProducts.mk) \ endef # -# Returns the sorted concatenation of all PRODUCT_MAKEFILES -# variables set in all AndroidProducts.mk files. -# $(call ) isn't necessary. +# Returns the sorted concatenation of PRODUCT_MAKEFILES +# variables set in the given AndroidProducts.mk files. +# $(1): the list of AndroidProducts.mk files. # -define get-all-product-makefiles +define get-product-makefiles $(sort \ - $(foreach f,$(_find-android-products-files), \ + $(foreach f,$(1), \ $(eval PRODUCT_MAKEFILES :=) \ $(eval LOCAL_DIR := $(patsubst %/,%,$(dir $(f)))) \ $(eval include $(f)) \ @@ -47,6 +47,15 @@ $(sort \ endef # +# Returns the sorted concatenation of all PRODUCT_MAKEFILES +# variables set in all AndroidProducts.mk files. +# $(call ) isn't necessary. +# +define get-all-product-makefiles +$(call get-product-makefiles,$(_find-android-products-files)) +endef + +# # Functions for including product makefiles # |