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

Commit ffd5087e authored by Xavier Ducrohet's avatar Xavier Ducrohet
Browse files

Use the new sdk/build/tools.atree. 

As the sdk.git project is branched differently from the rest
of the platform, it's important to be able to control what
goes in the tools folder of the SDK on a per-branch basis.

Right now development/build/sdk.atree control what goes in
the tools folder (coming almost only from sdk.git) which causes
problems when the development.git and sdk.git branches are not
in sync.

Change-Id: Ia0b0ea37f8a4904b3a7f7805a552eeb499a2c0ee
parent b368bba4

core/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -1223,7 +1223,8 @@ atree_dir := development/build 
sdk_atree_files := \

	$(atree_dir)/sdk.exclude.atree \

	$(atree_dir)/sdk.atree \

	$(atree_dir)/sdk-$(HOST_OS)-$(HOST_ARCH).atree

	$(atree_dir)/sdk-$(HOST_OS)-$(HOST_ARCH).atree \

	sdk/build/tools.atree



deps := \

	$(target_notice_file_txt) \
@@ -1237,6 +1238,7 @@ deps := \ 
	$(INSTALLED_BUILD_PROP_TARGET) \

	$(ATREE_FILES) \

	$(atree_dir)/sdk.atree \

	sdk/build/tools.atree \

	$(HOST_OUT_EXECUTABLES)/atree \

    $(HOST_OUT_EXECUTABLES)/line_endings