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

Commit 53d2ca07 authored by Ying Wang's avatar Ying Wang Committed by Android Git Automerger
Browse files

am 4170e2be: am fd841351: Merge "Support custom sdk.atree files." into klp-modular-dev 

* commit '4170e2be':
  Support custom sdk.atree files.
parents 3afdef2e 4170e2be

core/Makefile

+6 −0
Original line number Diff line number Diff line
@@ -1571,6 +1571,12 @@ sdk_atree_files := \ 
	$(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

core/product.mk

+1 −0
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ _product_var_list := \ 
    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 \