Merge "Use AndroidProducts.mk list from Soong's finder"
This commit is contained in:
committed by
Gerrit Code Review
commit
7ae1713dca
@@ -23,21 +23,12 @@
|
|||||||
# and the .mk suffix) of the product makefile, "<product_name>:" can be
|
# and the .mk suffix) of the product makefile, "<product_name>:" can be
|
||||||
# omitted.
|
# omitted.
|
||||||
|
|
||||||
# Search for AndroidProducts.mks in the given dir.
|
|
||||||
# $(1): the path to the dir
|
|
||||||
define _search-android-products-files-in-dir
|
|
||||||
$(sort $(shell test -d $(1) && find -L $(1) \
|
|
||||||
-maxdepth 6 \
|
|
||||||
-name .git -prune \
|
|
||||||
-o -name AndroidProducts.mk -print))
|
|
||||||
endef
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# Returns the list of all AndroidProducts.mk files.
|
# Returns the list of all AndroidProducts.mk files.
|
||||||
# $(call ) isn't necessary.
|
# $(call ) isn't necessary.
|
||||||
#
|
#
|
||||||
define _find-android-products-files
|
define _find-android-products-files
|
||||||
$(foreach d, device vendor product,$(call _search-android-products-files-in-dir,$(d))) \
|
$(file <$(OUT_DIR)/.module_paths/AndroidProducts.mk.list) \
|
||||||
$(SRC_TARGET_DIR)/product/AndroidProducts.mk
|
$(SRC_TARGET_DIR)/product/AndroidProducts.mk
|
||||||
endef
|
endef
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user