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

Commit b1f43648 authored by Griff Hazen's avatar Griff Hazen Committed by Android Git Automerger
Browse files

am d3b40d52: am 6c23e7b8: am 433febb3: Re-order atree files so... 

am d3b40d52: am 6c23e7b8: am 433febb3: Re-order atree files so PRODUCT_SDK_ATREE_FILES can provide overrides.

* commit 'd3b40d52':
  Re-order atree files so PRODUCT_SDK_ATREE_FILES can provide overrides.
parents 2284a1c0 d3b40d52

core/Makefile

+6 −6
Original line number Diff line number Diff line
@@ -1567,12 +1567,6 @@ 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
@@ -1581,6 +1575,12 @@ ifneq (,$(strip $(wildcard $(atree_dir)/sdk-android-$(TARGET_CPU_ABI).atree))) 
  sdk_atree_files += $(atree_dir)/sdk-android-$(TARGET_CPU_ABI).atree

endif



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



deps := \

	$(target_notice_file_txt) \

	$(tools_notice_file_txt) \