commit 7ae1713dca4db8927736ca5720c80f8fd7dc1614
author android-build-prod (mdb) <android-build-team-robot@google.com> Wed May 02 08:27:24 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed May 02 08:27:24 2018 +0000
tree 0500e96184fa02b12b3d1357910630fadd3067c7
parent 88727e2422d2e1689f76398abd605b09373b7973
parent b9d63519c0ac0f6a83cade0f5656a2ee73e816ed

Merge "Use AndroidProducts.mk list from Soong's finder"

core/product.mk

diff --git a/core/product.mk b/core/product.mk
index 1a15c9f..976c939 100644
--- a/core/product.mk
+++ b/core/product.mk
@@ -23,21 +23,12 @@
 # and the .mk suffix) of the product makefile, "<product_name>:" can be
 # 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.
 # $(call ) isn't necessary.
 #
 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
 endef