am 4170e2be: am fd841351: Merge "Support custom sdk.atree files." into klp-modular-dev
* commit '4170e2be8e7493f2ad1abd33ba74638d9d421b3b':
Support custom sdk.atree files.
diff --git a/core/Makefile b/core/Makefile
index 22539e5..92001dd 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1571,6 +1571,12 @@
$(atree_dir)/sdk-$(HOST_OS)-$(HOST_ARCH).atree \
$(sdk_tools_atree_files)
+ifneq ($(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SDK_ATREE_FILES),)
+sdk_atree_files += $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SDK_ATREE_FILES)
+else
+sdk_atree_files += $(atree_dir)/sdk.atree
+endif
+
# development/build/sdk-android-<abi>.atree is used to differentiate
# between architecture models (e.g. ARMv5TE versus ARMv7) when copying
# files like the kernel image. We use TARGET_CPU_ABI because we don't
diff --git a/core/product.mk b/core/product.mk
index 67f5fdf..eb4771c 100644
--- a/core/product.mk
+++ b/core/product.mk
@@ -86,6 +86,7 @@
PRODUCT_PACKAGE_OVERLAYS \
DEVICE_PACKAGE_OVERLAYS \
PRODUCT_TAGS \
+ PRODUCT_SDK_ATREE_FILES \
PRODUCT_SDK_ADDON_NAME \
PRODUCT_SDK_ADDON_COPY_FILES \
PRODUCT_SDK_ADDON_COPY_MODULES \